Merge pull request #115 from rage/dep-sort

Heliozoa · web-flow · commit 3b241fb3c1eb · 2021-03-08T13:49:17.000+02:00
Dep sort
diff --git a/plugins/csharp/Cargo.toml b/plugins/csharp/Cargo.toml
@@ -7,14 +7,15 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 tmc-langs-framework = { path = "../../tmc-langs-framework" }
-walkdir = "2"
+
 dirs = "3"
-thiserror = "1"
-serde_json = "1"
 log = "0.4"
 serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+thiserror = "1"
+walkdir = "2"
 
 [dev-dependencies]
-tempfile = "3"
 simple_logger = "1"
+tempfile = "3"
 zip = "0.5"
diff --git a/plugins/java/Cargo.toml b/plugins/java/Cargo.toml
@@ -7,17 +7,18 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 tmc-langs-framework = { path = "../../tmc-langs-framework" }
+
+dirs = "3"
+flate2 = "1"
+j4rs = "0.13.0" # specific version to match the jar
+lazy_static = "1"
 log = "0.4"
-walkdir = "2"
-thiserror = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-j4rs = "0.13.0" # specific version to match the jar
-tempfile = "3"
-lazy_static = "1"
-dirs = "3"
 tar = "0.4"
-flate2 = "1"
+tempfile = "3"
+thiserror = "1"
+walkdir = "2"
 
 [dev-dependencies]
 simple_logger = "1"
diff --git a/plugins/make/Cargo.toml b/plugins/make/Cargo.toml
@@ -7,16 +7,17 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 tmc-langs-framework = { path = "../../tmc-langs-framework" }
+
+lazy_static = "1"
 log = "0.4"
-thiserror = "1"
 regex = "1"
-lazy_static = "1"
-serde-xml-rs = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde_yaml = "0.8"
+serde-xml-rs = "0.4"
+thiserror = "1"
 
 [dev-dependencies]
 simple_logger = "1"
-walkdir = "2"
 tempfile = "3"
+walkdir = "2"
 zip = "0.5"
diff --git a/plugins/notests/Cargo.toml b/plugins/notests/Cargo.toml
@@ -7,6 +7,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 tmc-langs-framework = { path = "../../tmc-langs-framework" }
+
 log = "0.4"
 
 [dev-dependencies]
diff --git a/plugins/python3/Cargo.toml b/plugins/python3/Cargo.toml
@@ -7,17 +7,18 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 tmc-langs-framework = { path = "../../tmc-langs-framework" }
+
+dunce = "1"
+hex = "0.4"
+hmac = "0.10"
 lazy_static = "1"
 log = "0.4"
+rand = "0.8"
 serde = "1"
 serde_json = "1"
+sha2 = "0.9"
 thiserror = "1"
 walkdir = "2"
-dunce = "1"
-rand = "0.8"
-hmac = "0.10"
-sha2 = "0.9"
-hex = "0.4"
 
 [dev-dependencies]
 simple_logger = "1"
diff --git a/plugins/python3/src/plugin.rs b/plugins/python3/src/plugin.rs
@@ -442,8 +442,6 @@ mod test {
     }
 
     fn dir_to_zip(source_dir: impl AsRef<std::path::Path>) -> Vec<u8> {
-        use std::io::Write;
-
         let mut target = vec![];
         let mut zip = zip::ZipWriter::new(std::io::Cursor::new(&mut target));
 
diff --git a/plugins/r/Cargo.toml b/plugins/r/Cargo.toml
@@ -7,13 +7,14 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 tmc-langs-framework = { path = "../../tmc-langs-framework" }
+
 log = "0.4"
-thiserror = "1"
-serde_json = "1"
 serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+thiserror = "1"
 
 [dev-dependencies]
 simple_logger = "1"
-walkdir = "2"
 tempfile = "3"
+walkdir = "2"
 zip = "0.5"
diff --git a/tmc-client/Cargo.toml b/tmc-client/Cargo.toml
@@ -7,23 +7,24 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 tmc-langs-util = { path = "../tmc-langs-util" }
-reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls", "multipart"] }
-thiserror = "1"
-serde = { version = "1", features = ["derive"] }
+
+dirs = "3"
 http = "0.2"
-url = "2"
+lazy_static = "1"
 log = "0.4"
 oauth2 = { version = "4.0.0-alpha.3", features = ["reqwest"] }
-tempfile = "3"
-dirs = "3"
-regex = "1"
-lazy_static = "1"
 percent-encoding = "2"
-serde_json = "1"
+regex = "1"
+reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls", "multipart"] }
 schemars = "0.8"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+tempfile = "3"
+thiserror = "1"
+url = "2"
 walkdir = "2"
 
 [dev-dependencies]
-simple_logger = "1"
-mockito = "0.29"
 dotenv = "0.15"
+mockito = "0.29"
+simple_logger = "1"
diff --git a/tmc-langs-cli/Cargo.toml b/tmc-langs-cli/Cargo.toml
@@ -10,25 +10,26 @@ license = "MIT OR Apache-2.0"
 tmc-client = { path = "../tmc-client" }
 tmc-langs-framework = { path = "../tmc-langs-framework" }
 tmc-langs-util = { path = "../tmc-langs-util" }
+
+anyhow = "1"
+base64 = "0.13"
 clap = "2"
-walkdir = "2"
-serde_json = "1"
+dirs = "3"
 env_logger = "0.8"
 log = "0.4"
+quit = "1"
 rpassword = "5"
-url = "2"
+schemars = "0.8"
 serde = "1"
-anyhow = "1"
-quit = "1"
-dirs = "3"
+serde_json = "1"
+smol = "1"
 tempfile = "3"
-base64 = "0.13"
-schemars = "0.8"
 thiserror = "1"
 toml = "0.5"
-smol = "1"
+url = "2"
+walkdir = "2"
 
 [dev-dependencies]
-tempfile = "3"
 dotenv = "0.15"
 simple_logger = "1"
+tempfile = "3"
diff --git a/tmc-langs-framework/Cargo.toml b/tmc-langs-framework/Cargo.toml
@@ -6,28 +6,28 @@ edition = "2018"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-regex = "1"
+anyhow = "1"
+fd-lock = "2"
+funty = "=1.1.0"  # temporary workaround, remove later
+isolang = "1"
 lazy_static = "1"
 log = "0.4"
-walkdir = "2"
-isolang = "1"
-thiserror = "1"
+nom = { version = "6", features = ["alloc"] }
+once_cell = "1"
+regex = "1"
 serde = { version = "1", features = ["derive"] }
 serde_yaml = "0.8"
-zip = "0.5"
 schemars = "0.8"
-once_cell = "1"
-nom = { version = "6", features = ["alloc"] }
-funty = "=1.1.0"  # temporary workaround, remove later
 subprocess = "0.2"
 tempfile = "3"
-anyhow = "1"
-fd-lock = "2"
+thiserror = "1"
+walkdir = "2"
+zip = "0.5"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"
 
 [dev-dependencies]
-tempfile = "3"
 mockall = "0.9"
 simple_logger = "1"
+tempfile = "3"
diff --git a/tmc-langs-util/Cargo.toml b/tmc-langs-util/Cargo.toml
@@ -13,28 +13,29 @@ tmc-langs-make = { path = "../plugins/make" }
 tmc-langs-notests = { path = "../plugins/notests" }
 tmc-langs-python3 = { path = "../plugins/python3" }
 tmc-langs-r = { path = "../plugins/r" }
-log = "0.4"
-tar = "0.4"
-walkdir = "2"
-tempfile = "3"
-zip = "0.5"
-shellwords = "1"
-thiserror = "1"
+
+heim = { version = "0.1.0-beta.3", features = ["disk"] }
 impl-enum = "0.2"
-zstd = "0.6"
 lazy_static = "1"
-regex = "1"
-serde_yaml = "0.8"
+log = "0.4"
 md5 = "0.7"
+once_cell = "1"
+regex = "1"
 serde = { version = "1", features = ["derive"] }
+serde_yaml = "0.8"
 schemars = "0.8"
-heim = { version = "0.1.0-beta.3", features = ["disk"] }
+shellwords = "1"
 smol = "1"
-once_cell = "1"
-type-map = "0.4"
+tar = "0.4"
+tempfile = "3"
+thiserror = "1"
+type-map = "0.5"
+walkdir = "2"
+zip = "0.5"
+zstd = "0.6"
 
 [target.'cfg(unix)'.dependencies]
-nix = "0.19"
+nix = "0.20"
 
 [dev-dependencies]
 simple_logger = "1"

Original file line number	Diff line number	Diff line change
`@@ -442,8 +442,6 @@ mod test {`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`fn dir_to_zip(source_dir: impl AsRef<std::path::Path>) -> Vec<u8> {`
`445`		`- use std::io::Write;`
`446`		`-`
`447`	`445`	`let mut target = vec![];`
`448`	`446`	`let mut zip = zip::ZipWriter::new(std::io::Cursor::new(&mut target));`
`449`	`447`