Merge pull request rust-lang#3297 from matthiaskrgr/deps

scampi · web-flow · commit 4e7eda420c9c · 2019-01-27T02:23:59.000+01:00
update dependencies
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,7 @@ generic-simd = ["bytecount/generic-simd"]
 
 [dependencies]
 atty = "0.2"
-itertools = "0.7"
+itertools = "0.8"
 toml = "0.4"
 serde = "1.0"
 serde_derive = "1.0"
@@ -44,15 +44,15 @@ regex = "1.0"
 term = "0.5"
 diff = "0.1"
 log = "0.4"
-env_logger = "0.5"
+env_logger = "0.6"
 getopts = "0.2"
 derive-new = "0.5"
-cargo_metadata = "0.6"
+cargo_metadata = "0.7"
 rustc-ap-rustc_target = "306.0.0"
 rustc-ap-syntax = "306.0.0"
 rustc-ap-syntax_pos = "306.0.0"
-failure = "0.1.1"
-bytecount = "0.4"
+failure = "0.1.3"
+bytecount = "0.5"
 unicode-width = "0.1.5"
 unicode_categories = "0.1.1"
 
diff --git a/src/cargo-fmt/main.rs b/src/cargo-fmt/main.rs
@@ -378,7 +378,12 @@ fn run_rustfmt(
 }
 
 fn get_cargo_metadata(manifest_path: Option<&Path>) -> Result<cargo_metadata::Metadata, io::Error> {
-    match cargo_metadata::metadata(manifest_path) {
+    let mut cmd = cargo_metadata::MetadataCommand::new();
+    cmd.no_deps();
+    if let Some(manifest_path) = manifest_path {
+        cmd.manifest_path(manifest_path);
+    }
+    match cmd.exec() {
         Ok(metadata) => Ok(metadata),
         Err(error) => Err(io::Error::new(io::ErrorKind::Other, error.to_string())),
     }

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,12 @@ fn run_rustfmt(`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`fn get_cargo_metadata(manifest_path: Option<&Path>) -> Result<cargo_metadata::Metadata, io::Error> {`
`381`		`- match cargo_metadata::metadata(manifest_path) {`
	`381`	`+ let mut cmd = cargo_metadata::MetadataCommand::new();`
	`382`	`+ cmd.no_deps();`
	`383`	`+ if let Some(manifest_path) = manifest_path {`
	`384`	`+ cmd.manifest_path(manifest_path);`
	`385`	`+ }`
	`386`	`+ match cmd.exec() {`
`382`	`387`	`Ok(metadata) => Ok(metadata),`
`383`	`388`	`Err(error) => Err(io::Error::new(io::ErrorKind::Other, error.to_string())),`
`384`	`389`	`}`