Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
update itertools from 0.7 to 0.8
update env_logger from 0.5 to 0.6
update cargo_metadata from 0.6 to 0.7
update bytecount from 0.4 to 0.5
  • Loading branch information
matthiaskrgr committed Jan 26, 2019
1 parent d2e91b5 commit d44ee75
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 24 deletions.
36 changes: 18 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down
7 changes: 6 additions & 1 deletion src/cargo-fmt/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
}
Expand Down

0 comments on commit d44ee75

Please sign in to comment.