Initial tweaks to Yomguithereal xsv prod fork to compile

src/cmd/apply.rs

@@ -1,10 +1,10 @@
-use csv;
-use regex::Regex;
+use crate::regex::Regex;
 
-use CliResult;
-use config::{Delimiter, Config};
-use select::SelectColumns;
-use util;
+use crate::CliResult;
+use crate::config::{Delimiter, Config};
+use crate::select::SelectColumns;
+use crate::util;
+use crate::serde::Deserialize;
 
 static USAGE: &'static str = "
 Apply a series of unary functions to a given CSV column. This can be used to

src/cmd/behead.rs

@@ -1,8 +1,7 @@
-use csv;
-
-use CliResult;
-use config::{Delimiter, Config};
-use util;
+use crate::CliResult;
+use crate::config::{Delimiter, Config};
+use crate::util;
+use serde::Deserialize;
 
 static USAGE: &'static str = "
 Drop a CSV file's header.

src/cmd/enumerate.rs

@@ -1,10 +1,10 @@
-use csv;
-use uuid::Uuid;
+use crate::uuid::Uuid;
 
-use CliResult;
-use select::SelectColumns;
-use config::{Delimiter, Config};
-use util;
+use crate::CliResult;
+use crate::select::SelectColumns;
+use crate::config::{Delimiter, Config};
+use crate::util;
+use serde::Deserialize;
 
 static USAGE: &'static str = r#"
 Add a new column enumerating the lines of a CSV file. This can be useful to keep

src/cmd/explode.rs

@@ -1,9 +1,8 @@
-use csv;
-
-use CliResult;
-use config::{Delimiter, Config};
-use select::SelectColumns;
-use util;
+use crate::CliResult;
+use crate::config::{Delimiter, Config};
+use crate::select::SelectColumns;
+use crate::util;
+use serde::Deserialize;
 
 static USAGE: &'static str = "
 Explodes a row into multiple ones by splitting a column value based on the

src/cmd/foreach.rs

@@ -1,14 +1,15 @@
-use csv;
-use regex::bytes::{Regex, NoExpand};
+use crate::regex::bytes::{Regex, NoExpand};
 use std::process::{Command, Stdio};
 use std::io::{BufReader};
 use std::ffi::OsStr;
+#[cfg(target_family="unix")]
 use std::os::unix::ffi::OsStrExt;
 
-use CliResult;
-use config::{Delimiter, Config};
-use select::SelectColumns;
-use util;
+use crate::CliResult;
+use crate::config::{Delimiter, Config};
+use crate::select::SelectColumns;
+use crate::util;
+use serde::Deserialize;
 
 static USAGE: &'static str = "
 Execute a bash command once per line in given CSV file.
@@ -62,6 +63,10 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
  .no_headers(args.flag_no_headers)
  .select(args.arg_column);
 
+ if cfg!(windows) {
+ panic!("foreach command does not work on Windows");
+ }
+
  let mut rdr = rconfig.reader()?;
  let mut wtr = Config::new(&None).writer()?;
 
@@ -85,6 +90,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
 
  let mut command_pieces = splitter_pattern.find_iter(&templated_command);
 
+ #[cfg(target_family="unix")]
  let prog = OsStr::from_bytes(command_pieces.next().unwrap().as_bytes());
 
  let cmd_args: Vec<String> = command_pieces.map(|piece| {
@@ -93,6 +99,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
  return String::from_utf8(clean_piece.into_owned()).expect("encoding error");
  }).collect();
 
+ #[cfg(target_family="unix")]
  if !args.flag_unify {
  let mut cmd = Command::new(prog)
  .args(cmd_args)

src/cmd/jsonl.rs

@@ -1,11 +1,11 @@
-use csv;
 use std::fs;
 use std::io::{self, BufRead, BufReader};
-use serde_json::Value;
+use crate::serde_json::Value;
 
-use CliResult;
-use config::{Config};
-use util;
+use crate::CliResult;
+use crate::config::{Config};
+use crate::util;
+use serde::Deserialize;
 
 static USAGE: &'static str = "
 Converts a newline-delimited JSON file (.ndjson or .jsonl, typically) into

src/cmd/lua.rs

@@ -1,13 +1,12 @@
-use csv;
-
 use std::io::prelude::*;
 use std::fs::File;
 
-use CliResult;
-use CliError;
-use config::{Config, Delimiter};
-use hlua::{Lua, LuaTable, LuaError, AnyLuaValue};
-use util;
+use crate::CliResult;
+use crate::CliError;
+use crate::config::{Config, Delimiter};
+use crate::hlua::{Lua, LuaTable, LuaError, AnyLuaValue};
+use crate::util;
+use serde::Deserialize;
 
 // TODO: options for boolean return coercion
 

src/cmd/pseudo.rs

@@ -1,11 +1,10 @@
 use std::collections::HashMap;
 
-use csv;
-
-use CliResult;
-use config::{Delimiter, Config};
-use select::SelectColumns;
-use util;
+use crate::CliResult;
+use crate::config::{Delimiter, Config};
+use crate::select::SelectColumns;
+use crate::serde::Deserialize;
+use crate::util;
 
 static USAGE: &'static str = "
 Pseudonymise the value of the given column by replacing them by an

src/cmd/python.rs

@@ -1,12 +1,11 @@
-use csv;
-
-use pyo3::prelude::*;
-use pyo3::types::PyDict;
-
-use CliResult;
-use CliError;
-use config::{Config, Delimiter};
-use util;
+use crate::pyo3::prelude::*;
+use crate::pyo3::types::PyDict;
+
+use crate::CliResult;
+use crate::CliError;
+use crate::config::{Config, Delimiter};
+use crate::util;
+use serde::Deserialize;
 
 const HELPERS: &str = r#"
 def cast_as_string(value):

src/cmd/replace.rs

@@ -1,11 +1,11 @@
-use csv;
-use regex::bytes::RegexBuilder;
+use crate::regex::bytes::RegexBuilder;
 use std::borrow::Cow;
 
-use CliResult;
-use config::{Config, Delimiter};
-use select::SelectColumns;
-use util;
+use crate::CliResult;
+use crate::config::{Config, Delimiter};
+use crate::select::SelectColumns;
+use crate::util;
+use serde::Deserialize;
 
 static USAGE: &'static str = "
 Replace occurrences of a pattern across a CSV file.

tests/test_apply.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn apply() {

tests/test_behead.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn behead() {

tests/test_enumerate.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn enumerate() {

tests/test_explode.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn explode() {

tests/test_foreach.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn foreach() {

tests/test_lua.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn lua_map() {

tests/test_pseudo.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn pseudo() {

tests/test_py.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn py_map() {

tests/test_replace.rs

@@ -1,4 +1,4 @@
-use workdir::Workdir;
+use crate::workdir::Workdir;
 
 #[test]
 fn replace() {