Skip to content

Commit

Permalink
run rustfmt
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiaskrgr committed Jun 7, 2019
1 parent 64ae327 commit dac967c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
8 changes: 6 additions & 2 deletions src/bin/cargo/commands/vendor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,17 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
None
};
if let Some(flag) = crates_io_cargo_vendor_flag {
return Err(failure::format_err!("\
return Err(failure::format_err!(
"\
the crates.io `cargo vendor` command has now been merged into Cargo itself
and does not support the flag `{}` currently; to continue using the flag you
can execute `cargo-vendor vendor ...`, and if you would like to see this flag
supported in Cargo itself please feel free to file an issue at
https://github.com/rust-lang/cargo/issues/new
", flag).into());
",
flag
)
.into());
}

let ws = args.workspace(config)?;
Expand Down
1 change: 0 additions & 1 deletion src/cargo/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ fn handle_cause(cargo_err: &Error, shell: &mut Shell) -> bool {

// The first error has already been printed to the shell.
for err in cargo_err.iter_causes() {

// If we're not in verbose mode then print remaining errors until one
// marked as `Internal` appears.
if verbose != Verbose && err.downcast_ref::<Internal>().is_some() {
Expand Down
6 changes: 3 additions & 3 deletions src/cargo/util/sha256.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use self::crypto_hash::{Algorithm, Hasher};
use std::fs::File;
use crate::util::{CargoResult, CargoResultExt};
use crypto_hash;
use std::io::{self, Write, Read};
use std::fs::File;
use std::io::{self, Read, Write};
use std::path::Path;
use crate::util::{CargoResult, CargoResultExt};

pub struct Sha256(Hasher);

Expand Down

0 comments on commit dac967c

Please sign in to comment.