Skip to content

Commit dac967c

Browse files
committed
run rustfmt
1 parent 64ae327 commit dac967c

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/bin/cargo/commands/vendor.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,17 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
9393
None
9494
};
9595
if let Some(flag) = crates_io_cargo_vendor_flag {
96-
return Err(failure::format_err!("\
96+
return Err(failure::format_err!(
97+
"\
9798
the crates.io `cargo vendor` command has now been merged into Cargo itself
9899
and does not support the flag `{}` currently; to continue using the flag you
99100
can execute `cargo-vendor vendor ...`, and if you would like to see this flag
100101
supported in Cargo itself please feel free to file an issue at
101102
https://github.com/rust-lang/cargo/issues/new
102-
", flag).into());
103+
",
104+
flag
105+
)
106+
.into());
103107
}
104108

105109
let ws = args.workspace(config)?;

src/cargo/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ fn handle_cause(cargo_err: &Error, shell: &mut Shell) -> bool {
160160

161161
// The first error has already been printed to the shell.
162162
for err in cargo_err.iter_causes() {
163-
164163
// If we're not in verbose mode then print remaining errors until one
165164
// marked as `Internal` appears.
166165
if verbose != Verbose && err.downcast_ref::<Internal>().is_some() {

src/cargo/util/sha256.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use self::crypto_hash::{Algorithm, Hasher};
2-
use std::fs::File;
2+
use crate::util::{CargoResult, CargoResultExt};
33
use crypto_hash;
4-
use std::io::{self, Write, Read};
4+
use std::fs::File;
5+
use std::io::{self, Read, Write};
56
use std::path::Path;
6-
use crate::util::{CargoResult, CargoResultExt};
77

88
pub struct Sha256(Hasher);
99

0 commit comments

Comments
 (0)