From 9c7ef5290109f4533a949b5c9abb558c5c2ca673 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 11 Nov 2016 19:16:59 +0100 Subject: [PATCH] Updated indent and rustversion.txt --- src/bin/bench.rs | 8 ++++---- src/bin/build.rs | 8 ++++---- src/bin/cargo.rs | 8 ++++---- src/bin/clean.rs | 8 ++++---- src/bin/doc.rs | 8 ++++---- src/bin/fetch.rs | 8 ++++---- src/bin/generate_lockfile.rs | 8 ++++---- src/bin/git_checkout.rs | 8 ++++---- src/bin/init.rs | 12 ++++++------ src/bin/install.rs | 8 ++++---- src/bin/login.rs | 8 ++++---- src/bin/metadata.rs | 8 ++++---- src/bin/new.rs | 14 ++++++------- src/bin/owner.rs | 8 ++++---- src/bin/package.rs | 8 ++++---- src/bin/pkgid.rs | 8 ++++---- src/bin/publish.rs | 8 ++++---- src/bin/run.rs | 8 ++++---- src/bin/rustc.rs | 10 +++++----- src/bin/rustdoc.rs | 10 +++++----- src/bin/search.rs | 8 ++++---- src/bin/test.rs | 8 ++++---- src/bin/uninstall.rs | 8 ++++---- src/bin/update.rs | 8 ++++---- src/bin/verify_project.rs | 8 ++++---- src/bin/yank.rs | 18 ++++++++--------- src/cargo/core/package.rs | 2 +- src/cargo/core/resolver/mod.rs | 16 +++++++-------- src/cargo/core/workspace.rs | 2 +- src/cargo/ops/cargo_compile.rs | 18 ++++++++--------- src/cargo/ops/cargo_generate_lockfile.rs | 4 ++-- src/cargo/ops/cargo_install.rs | 14 ++++++------- src/cargo/ops/cargo_output_metadata.rs | 10 +++++----- src/cargo/ops/cargo_rustc/layout.rs | 3 +-- src/cargo/ops/resolve.rs | 7 +++---- src/cargo/sources/path.rs | 6 ++---- src/cargo/sources/registry/local.rs | 4 ++-- src/cargo/sources/registry/remote.rs | 8 ++++---- src/cargo/util/flock.rs | 8 ++++---- src/cargo/util/paths.rs | 8 ++++---- src/cargo/util/toml.rs | 25 +++++++----------------- src/rustversion.txt | 2 +- tests/cargotest/support/mod.rs | 6 +++--- tests/resolve.rs | 4 +--- 44 files changed, 181 insertions(+), 198 deletions(-) diff --git a/src/bin/bench.rs b/src/bin/bench.rs index 18c90c624..774b3003c 100644 --- a/src/bin/bench.rs +++ b/src/bin/bench.rs @@ -73,10 +73,10 @@ Compilation can be customized with the `bench` profile in the manifest. pub fn execute(options: Options, config: &Config) -> CliResult> { let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let ops = ops::TestOptions { no_run: options.flag_no_run, no_fail_fast: false, diff --git a/src/bin/build.rs b/src/bin/build.rs index 439201f74..7e6688b41 100644 --- a/src/bin/build.rs +++ b/src/bin/build.rs @@ -70,10 +70,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { debug!("executing; cmd=cargo-build; args={:?}", env::args().collect::>()); config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs index 94bcfbb9e..05c88019b 100644 --- a/src/bin/cargo.rs +++ b/src/bin/cargo.rs @@ -117,10 +117,10 @@ each_subcommand!(declare_mod); */ fn execute(flags: Flags, config: &Config) -> CliResult> { config.configure(flags.flag_verbose, - flags.flag_quiet, - &flags.flag_color, - flags.flag_frozen, - flags.flag_locked)?; + flags.flag_quiet, + &flags.flag_color, + flags.flag_frozen, + flags.flag_locked)?; init_git_transports(config); let _token = cargo::util::job::setup(); diff --git a/src/bin/clean.rs b/src/bin/clean.rs index 5a36aa600..35146c687 100644 --- a/src/bin/clean.rs +++ b/src/bin/clean.rs @@ -45,10 +45,10 @@ and its format, see the `cargo help pkgid` command. pub fn execute(options: Options, config: &Config) -> CliResult> { debug!("executing; cmd=cargo-clean; args={:?}", env::args().collect::>()); config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; let opts = ops::CleanOptions { diff --git a/src/bin/doc.rs b/src/bin/doc.rs index c4de72dc0..f8b434247 100644 --- a/src/bin/doc.rs +++ b/src/bin/doc.rs @@ -63,10 +63,10 @@ the `cargo help pkgid` command. pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; diff --git a/src/bin/fetch.rs b/src/bin/fetch.rs index 8d191c55a..877d53869 100644 --- a/src/bin/fetch.rs +++ b/src/bin/fetch.rs @@ -40,10 +40,10 @@ all updated. pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; let ws = Workspace::new(&root, config)?; ops::fetch(&ws)?; diff --git a/src/bin/generate_lockfile.rs b/src/bin/generate_lockfile.rs index 7c170d05b..40717435f 100644 --- a/src/bin/generate_lockfile.rs +++ b/src/bin/generate_lockfile.rs @@ -34,10 +34,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { debug!("executing; cmd=cargo-generate-lockfile; args={:?}", env::args().collect::>()); config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; let ws = Workspace::new(&root, config)?; diff --git a/src/bin/git_checkout.rs b/src/bin/git_checkout.rs index ebfde445e..268776c7b 100644 --- a/src/bin/git_checkout.rs +++ b/src/bin/git_checkout.rs @@ -31,10 +31,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let Options { flag_url: url, flag_reference: reference, .. } = options; let url = url.to_url()?; diff --git a/src/bin/init.rs b/src/bin/init.rs index c5d5017f5..1b69a2204 100644 --- a/src/bin/init.rs +++ b/src/bin/init.rs @@ -42,10 +42,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { debug!("executing; cmd=cargo-init; args={:?}", env::args().collect::>()); config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let Options { flag_bin, flag_lib, arg_path, flag_name, flag_vcs, .. } = options; @@ -60,8 +60,8 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { ops::init(opts, config)?; config.shell().status("Created", format!("{} project", - if opts_lib { "library" } - else {"binary (application)"}))?; + if opts_lib { "library" } + else {"binary (application)"}))?; Ok(None) } diff --git a/src/bin/install.rs b/src/bin/install.rs index c9e75ade0..c27db56ff 100644 --- a/src/bin/install.rs +++ b/src/bin/install.rs @@ -96,10 +96,10 @@ The `--list` option will list all installed packages (and their versions). pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let compile_opts = ops::CompileOptions { config: config, diff --git a/src/bin/login.rs b/src/bin/login.rs index d93e11f8d..6bb3618da 100644 --- a/src/bin/login.rs +++ b/src/bin/login.rs @@ -36,10 +36,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let token = match options.arg_token.clone() { Some(token) => token, None => { diff --git a/src/bin/metadata.rs b/src/bin/metadata.rs index df3b21ad6..7971d0707 100644 --- a/src/bin/metadata.rs +++ b/src/bin/metadata.rs @@ -44,10 +44,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let manifest = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; let options = OutputMetadataOptions { diff --git a/src/bin/new.rs b/src/bin/new.rs index da505af49..7b7ab664b 100644 --- a/src/bin/new.rs +++ b/src/bin/new.rs @@ -42,10 +42,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { debug!("executing; cmd=cargo-new; args={:?}", env::args().collect::>()); config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let Options { flag_bin, flag_lib, arg_path, flag_name, flag_vcs, .. } = options; @@ -59,9 +59,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { ops::new(opts, config)?; config.shell().status("Created", format!("{} `{}` project", - if opts_lib { "library" } - else {"binary (application)"}, - arg_path))?; + if opts_lib { "library" } + else {"binary (application)"}, + arg_path))?; Ok(None) } diff --git a/src/bin/owner.rs b/src/bin/owner.rs index f1232e99b..4c6976aa7 100644 --- a/src/bin/owner.rs +++ b/src/bin/owner.rs @@ -46,10 +46,10 @@ and troubleshooting. pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let opts = ops::OwnersOptions { krate: options.arg_crate, token: options.flag_token, diff --git a/src/bin/package.rs b/src/bin/package.rs index 66cf3ada7..f3f95a99c 100644 --- a/src/bin/package.rs +++ b/src/bin/package.rs @@ -41,10 +41,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; let ws = Workspace::new(&root, config)?; ops::package(&ws, &ops::PackageOpts { diff --git a/src/bin/pkgid.rs b/src/bin/pkgid.rs index e0588cae3..e18a505bf 100644 --- a/src/bin/pkgid.rs +++ b/src/bin/pkgid.rs @@ -55,10 +55,10 @@ Example Package IDs pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path.clone(), config.cwd())?; let ws = Workspace::new(&root, config)?; diff --git a/src/bin/publish.rs b/src/bin/publish.rs index 60534f4cf..56db84d17 100644 --- a/src/bin/publish.rs +++ b/src/bin/publish.rs @@ -44,10 +44,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let Options { flag_token: token, flag_host: host, diff --git a/src/bin/run.rs b/src/bin/run.rs index 1de5ccbba..1e7089a75 100644 --- a/src/bin/run.rs +++ b/src/bin/run.rs @@ -59,10 +59,10 @@ the ones before go to Cargo. pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; diff --git a/src/bin/rustc.rs b/src/bin/rustc.rs index 1268c7ba2..a73088bfd 100644 --- a/src/bin/rustc.rs +++ b/src/bin/rustc.rs @@ -77,13 +77,13 @@ pub fn execute(options: Options, config: &Config) -> CliResult> { debug!("executing; cmd=cargo-rustc; args={:?}", env::args().collect::>()); config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, - config.cwd())?; + config.cwd())?; let mode = match options.flag_profile.as_ref().map(|t| &t[..]) { Some("dev") | None => CompileMode::Build, Some("test") => CompileMode::Test, diff --git a/src/bin/rustdoc.rs b/src/bin/rustdoc.rs index d993a4850..0d159f47a 100644 --- a/src/bin/rustdoc.rs +++ b/src/bin/rustdoc.rs @@ -72,13 +72,13 @@ the `cargo help pkgid` command. pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, - config.cwd())?; + config.cwd())?; let doc_opts = ops::DocOptions { open_result: options.flag_open, diff --git a/src/bin/search.rs b/src/bin/search.rs index 828356dc0..eebe34988 100644 --- a/src/bin/search.rs +++ b/src/bin/search.rs @@ -35,10 +35,10 @@ Options: pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let Options { flag_host: host, flag_limit: limit, diff --git a/src/bin/test.rs b/src/bin/test.rs index 5ae7dee94..c28ff8fc4 100644 --- a/src/bin/test.rs +++ b/src/bin/test.rs @@ -90,10 +90,10 @@ To get the list of all options available for the test binaries use this: pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; diff --git a/src/bin/uninstall.rs b/src/bin/uninstall.rs index 659702bd9..b5c827e7a 100644 --- a/src/bin/uninstall.rs +++ b/src/bin/uninstall.rs @@ -39,10 +39,10 @@ only uninstall particular binaries. pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = options.flag_root.as_ref().map(|s| &s[..]); ops::uninstall(root, &options.arg_spec, &options.flag_bin, config)?; diff --git a/src/bin/update.rs b/src/bin/update.rs index 064bb5ee9..6cf1e7986 100644 --- a/src/bin/update.rs +++ b/src/bin/update.rs @@ -60,10 +60,10 @@ For more information about package id specifications, see `cargo help pkgid`. pub fn execute(options: Options, config: &Config) -> CliResult> { debug!("executing; cmd=cargo-update; args={:?}", env::args().collect::>()); config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?; let update_opts = ops::UpdateOptions { diff --git a/src/bin/verify_project.rs b/src/bin/verify_project.rs index 447bf7a5d..726e1ab35 100644 --- a/src/bin/verify_project.rs +++ b/src/bin/verify_project.rs @@ -39,10 +39,10 @@ Options: pub fn execute(args: Flags, config: &Config) -> CliResult> { config.configure(args.flag_verbose, - args.flag_quiet, - &args.flag_color, - args.flag_frozen, - args.flag_locked)?; + args.flag_quiet, + &args.flag_color, + args.flag_frozen, + args.flag_locked)?; let mut contents = String::new(); let filename = args.flag_manifest_path.unwrap_or("Cargo.toml".into()); diff --git a/src/bin/yank.rs b/src/bin/yank.rs index bac383c4f..760e8cb80 100644 --- a/src/bin/yank.rs +++ b/src/bin/yank.rs @@ -44,16 +44,16 @@ crates to be locked to any yanked version. pub fn execute(options: Options, config: &Config) -> CliResult> { config.configure(options.flag_verbose, - options.flag_quiet, - &options.flag_color, - options.flag_frozen, - options.flag_locked)?; + options.flag_quiet, + &options.flag_color, + options.flag_frozen, + options.flag_locked)?; ops::yank(config, - options.arg_crate, - options.flag_vers, - options.flag_token, - options.flag_index, - options.flag_undo)?; + options.arg_crate, + options.flag_vers, + options.flag_token, + options.flag_index, + options.flag_undo)?; Ok(None) } diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs index 6fa0bb7f3..03ed7d887 100644 --- a/src/cargo/core/package.rs +++ b/src/cargo/core/package.rs @@ -74,7 +74,7 @@ impl Package { let path = manifest_path.parent().unwrap(); let source_id = SourceId::for_path(path)?; let (pkg, _) = ops::read_package(&manifest_path, &source_id, - config)?; + config)?; Ok(pkg) } diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index b67e32d56..0469f3c23 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -451,7 +451,7 @@ fn activate_deps_loop<'a>(mut cx: Context<'a>, let summary = Rc::new(summary.clone()); let candidate = Candidate { summary: summary, replace: None }; remaining_deps.extend(activate(&mut cx, registry, None, candidate, - method)?); + method)?); } // Main resolution loop, this is the workhorse of the resolution algorithm. @@ -559,7 +559,7 @@ fn activate_deps_loop<'a>(mut cx: Context<'a>, trace!("{}[{}]>{} trying {}", parent.name(), cur, dep.name(), candidate.summary.version()); remaining_deps.extend(activate(&mut cx, registry, Some(&parent), - candidate, &method)?); + candidate, &method)?); } Ok(cx) @@ -713,7 +713,7 @@ fn build_features(s: &Summary, method: &Method) } for dep in s.dependencies().iter().filter(|d| d.is_optional()) { add_feature(s, dep.name(), &mut deps, &mut used, - &mut visited)?; + &mut visited)?; } } Method::Required { features: requested_features, .. } => { @@ -727,7 +727,7 @@ fn build_features(s: &Summary, method: &Method) Method::Required { uses_default_features: true, .. } => { if s.features().get("default").is_some() { add_feature(s, "default", &mut deps, &mut used, - &mut visited)?; + &mut visited)?; } } Method::Required { uses_default_features: false, .. } => {} @@ -989,10 +989,10 @@ fn check_cycles(resolve: &Resolve, for pkg in all_packages { if !checked.contains(pkg) { visit(resolve, - pkg, - &summaries, - &mut HashSet::new(), - &mut checked)? + pkg, + &summaries, + &mut HashSet::new(), + &mut checked)? } } return Ok(()); diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index 95b2cd67f..f35432f64 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -483,7 +483,7 @@ impl<'cfg> Packages<'cfg> { Entry::Vacant(v) => { let source_id = SourceId::for_path(key)?; let pair = ops::read_manifest(&manifest_path, &source_id, - self.config)?; + self.config)?; let (manifest, _nested_paths) = pair; Ok(v.insert(match manifest { EitherManifest::Real(manifest) => { diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index a8ebb30e2..74b787694 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -205,7 +205,7 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>, } (Some(args), _) => { let targets = generate_targets(to_builds[0], profiles, - mode, filter, release)?; + mode, filter, release)?; if targets.len() == 1 { let (target, profile) = targets[0]; let mut profile = profile.clone(); @@ -219,7 +219,7 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>, } (None, Some(args)) => { let targets = generate_targets(to_builds[0], profiles, - mode, filter, release)?; + mode, filter, release)?; if targets.len() == 1 { let (target, profile) = targets[0]; let mut profile = profile.clone(); @@ -234,7 +234,7 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>, (None, None) => { for &to_build in to_builds.iter() { let targets = generate_targets(to_build, profiles, mode, - filter, release)?; + filter, release)?; package_targets.push((to_build, targets)); } } @@ -257,12 +257,12 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>, } ops::compile_targets(ws, - &package_targets, - &packages, - &resolve_with_overrides, - config, - build_config, - profiles)? + &package_targets, + &packages, + &resolve_with_overrides, + config, + build_config, + profiles)? }; ret.to_doc_test = to_builds.iter().map(|&p| p.clone()).collect(); diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index c09ee6702..989534cea 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -18,8 +18,8 @@ pub struct UpdateOptions<'a> { pub fn generate_lockfile(ws: &Workspace) -> CargoResult<()> { let mut registry = PackageRegistry::new(ws.config())?; let resolve = ops::resolve_with_previous(&mut registry, ws, - Method::Everything, - None, None, &[])?; + Method::Everything, + None, None, &[])?; ops::write_pkg_lockfile(ws, &resolve)?; Ok(()) } diff --git a/src/cargo/ops/cargo_install.rs b/src/cargo/ops/cargo_install.rs index b9a5aa85b..c2a348e2e 100644 --- a/src/cargo/ops/cargo_install.rs +++ b/src/cargo/ops/cargo_install.rs @@ -57,7 +57,7 @@ pub fn install(root: Option<&str>, let map = SourceConfigMap::new(config)?; let (pkg, source) = if source_id.is_git() { select_pkg(GitSource::new(source_id, config), source_id, - krate, vers, &mut |git| git.read_packages())? + krate, vers, &mut |git| git.read_packages())? } else if source_id.is_path() { let path = source_id.url().to_file_path().ok() .expect("path sources must have a valid path"); @@ -68,14 +68,14 @@ pub fn install(root: Option<&str>, specify an alternate source", path.display())) })?; select_pkg(PathSource::new(&path, source_id, config), - source_id, krate, vers, - &mut |path| path.read_packages())? + source_id, krate, vers, + &mut |path| path.read_packages())? } else { select_pkg(map.load(source_id)?, - source_id, krate, vers, - &mut |_| Err(human("must specify a crate to install from \ - crates.io, or use --path or --git to \ - specify alternate source")))? + source_id, krate, vers, + &mut |_| Err(human("must specify a crate to install from \ + crates.io, or use --path or --git to \ + specify alternate source")))? }; diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs index b8dfca5ef..bc1a04f0c 100644 --- a/src/cargo/ops/cargo_output_metadata.rs +++ b/src/cargo/ops/cargo_output_metadata.rs @@ -47,11 +47,11 @@ fn metadata_full(ws: &Workspace, PackageIdSpec::from_package_id(pkg.package_id()) }).collect::>(); let deps = ops::resolve_dependencies(ws, - None, - &opt.features, - opt.all_features, - opt.no_default_features, - &specs)?; + None, + &opt.features, + opt.all_features, + opt.no_default_features, + &specs)?; let (packages, resolve) = deps; let packages = try!(packages.package_ids() diff --git a/src/cargo/ops/cargo_rustc/layout.rs b/src/cargo/ops/cargo_rustc/layout.rs index 1e371a951..dae91aae7 100644 --- a/src/cargo/ops/cargo_rustc/layout.rs +++ b/src/cargo/ops/cargo_rustc/layout.rs @@ -78,8 +78,7 @@ impl Layout { // the target triple as a Path and then just use the file stem as the // component for the directory name. if let Some(triple) = triple { - path.push(Path::new(triple).file_stem() - .ok_or(human(format!("target was empty")))?); + path.push(Path::new(triple).file_stem().ok_or(human(format!("target was empty")))?); } path.push(dest); Layout::at(ws.config(), path) diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs index 42898b6af..335c06b88 100644 --- a/src/cargo/ops/resolve.rs +++ b/src/cargo/ops/resolve.rs @@ -15,8 +15,8 @@ pub fn resolve_ws(registry: &mut PackageRegistry, ws: &Workspace) -> CargoResult { let prev = ops::load_pkg_lockfile(ws)?; let resolve = resolve_with_previous(registry, ws, - Method::Everything, - prev.as_ref(), None, &[])?; + Method::Everything, + prev.as_ref(), None, &[])?; // Avoid writing a lockfile if we are `cargo install`ing a non local package. if ws.current_opt().map(|pkg| pkg.package_id().source_id().is_path()).unwrap_or(true) { @@ -88,8 +88,7 @@ pub fn resolve_with_previous<'a>(registry: &mut PackageRegistry, let mut summaries = Vec::new(); for member in ws.members() { - registry.add_sources(&[member.package_id().source_id() - .clone()])?; + registry.add_sources(&[member.package_id().source_id().clone()])?; let method_to_resolve = match method { // When everything for a workspace we want to be sure to resolve all // members in the workspace, so propagate the `Method::Everything`. diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index 197d756d6..e5a7ae6f8 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -94,10 +94,8 @@ impl<'cfg> PathSource<'cfg> { human(format!("could not parse pattern `{}`: {}", p, e)) }) }; - let exclude = pkg.manifest().exclude().iter() - .map(|p| parse(p)).collect::, _>>()?; - let include = pkg.manifest().include().iter() - .map(|p| parse(p)).collect::, _>>()?; + let exclude = pkg.manifest().exclude().iter().map(|p| parse(p)).collect::, _>>()?; + let include = pkg.manifest().include().iter().map(|p| parse(p)).collect::, _>>()?; let mut filter = |p: &Path| { let relative_path = util::without_prefix(p, &root).unwrap(); diff --git a/src/cargo/sources/registry/local.rs b/src/cargo/sources/registry/local.rs index 6c108cd90..67e88a9c7 100644 --- a/src/cargo/sources/registry/local.rs +++ b/src/cargo/sources/registry/local.rs @@ -61,8 +61,8 @@ impl<'cfg> RegistryData for LocalRegistry<'cfg> { -> CargoResult { let crate_file = format!("{}-{}.crate", pkg.name(), pkg.version()); let mut crate_file = self.root.open_ro(&crate_file, - self.config, - "crate file")?; + self.config, + "crate file")?; // If we've already got an unpacked version of this crate, then skip the // checksum below as it is in theory already verified. diff --git a/src/cargo/sources/registry/remote.rs b/src/cargo/sources/registry/remote.rs index d4bc14488..480b71859 100644 --- a/src/cargo/sources/registry/remote.rs +++ b/src/cargo/sources/registry/remote.rs @@ -45,8 +45,8 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> { fn config(&self) -> CargoResult> { let lock = self.index_path.open_ro(Path::new(INDEX_LOCK), - self.config, - "the registry index")?; + self.config, + "the registry index")?; let path = lock.path().parent().unwrap(); let contents = paths::read(&path.join("config.json"))?; let config = json::decode(&contents)?; @@ -65,8 +65,8 @@ impl<'cfg> RegistryData for RemoteRegistry<'cfg> { // Then we actually update the index self.index_path.create_dir()?; let lock = self.index_path.open_rw(Path::new(INDEX_LOCK), - self.config, - "the registry index")?; + self.config, + "the registry index")?; let path = lock.path().parent().unwrap(); self.config.shell().status("Updating", diff --git a/src/cargo/util/flock.rs b/src/cargo/util/flock.rs index a6f90afc3..a20540d06 100644 --- a/src/cargo/util/flock.rs +++ b/src/cargo/util/flock.rs @@ -217,13 +217,13 @@ impl Filesystem { match state { State::Exclusive => { acquire(config, msg, &path, - &|| f.try_lock_exclusive(), - &|| f.lock_exclusive())?; + &|| f.try_lock_exclusive(), + &|| f.lock_exclusive())?; } State::Shared => { acquire(config, msg, &path, - &|| f.try_lock_shared(), - &|| f.lock_shared())?; + &|| f.try_lock_shared(), + &|| f.lock_shared())?; } State::Unlocked => {} diff --git a/src/cargo/util/paths.rs b/src/cargo/util/paths.rs index 23a42a84c..d47598a2e 100644 --- a/src/cargo/util/paths.rs +++ b/src/cargo/util/paths.rs @@ -102,10 +102,10 @@ pub fn write(path: &Path, contents: &[u8]) -> CargoResult<()> { pub fn append(path: &Path, contents: &[u8]) -> CargoResult<()> { (|| -> CargoResult<()> { let mut f = OpenOptions::new() - .write(true) - .append(true) - .create(true) - .open(path)?; + .write(true) + .append(true) + .create(true) + .open(path)?; f.write_all(contents)?; Ok(()) diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs index c45ef1707..ca61e3a54 100644 --- a/src/cargo/util/toml.rs +++ b/src/cargo/util/toml.rs @@ -597,24 +597,15 @@ impl TomlManifest { } // Collect the deps - process_dependencies(&mut cx, self.dependencies.as_ref(), - None)?; - process_dependencies(&mut cx, self.dev_dependencies.as_ref(), - Some(Kind::Development))?; - process_dependencies(&mut cx, self.build_dependencies.as_ref(), - Some(Kind::Build))?; + process_dependencies(&mut cx, self.dependencies.as_ref(), None)?; + process_dependencies(&mut cx, self.dev_dependencies.as_ref(), Some(Kind::Development))?; + process_dependencies(&mut cx, self.build_dependencies.as_ref(), Some(Kind::Build))?; for (name, platform) in self.target.iter().flat_map(|t| t) { cx.platform = Some(name.parse()?); - process_dependencies(&mut cx, - platform.dependencies.as_ref(), - None)?; - process_dependencies(&mut cx, - platform.build_dependencies.as_ref(), - Some(Kind::Build))?; - process_dependencies(&mut cx, - platform.dev_dependencies.as_ref(), - Some(Kind::Development))?; + process_dependencies(&mut cx, platform.dependencies.as_ref(), None)?; + process_dependencies(&mut cx, platform.build_dependencies.as_ref(), Some(Kind::Build))?; + process_dependencies(&mut cx, platform.dev_dependencies.as_ref(), Some(Kind::Development))?; } replace = self.replace(&mut cx)?; @@ -635,9 +626,7 @@ impl TomlManifest { let exclude = project.exclude.clone().unwrap_or(Vec::new()); let include = project.include.clone().unwrap_or(Vec::new()); - let summary = Summary::new(pkgid, deps, - self.features.clone() - .unwrap_or(HashMap::new()))?; + let summary = Summary::new(pkgid, deps, self.features.clone() .unwrap_or(HashMap::new()))?; let metadata = ManifestMetadata { description: project.description.clone(), homepage: project.homepage.clone(), diff --git a/src/rustversion.txt b/src/rustversion.txt index 53b360454..e10ea3194 100644 --- a/src/rustversion.txt +++ b/src/rustversion.txt @@ -1 +1 @@ -2016-10-21 +2016-11-11 diff --git a/tests/cargotest/support/mod.rs b/tests/cargotest/support/mod.rs index 6da0aa56c..3a13b46ba 100644 --- a/tests/cargotest/support/mod.rs +++ b/tests/cargotest/support/mod.rs @@ -316,14 +316,14 @@ impl Execs { fn match_stdout(&self, actual: &Output) -> ham::MatchResult { self.match_std(self.expect_stdout.as_ref(), &actual.stdout, - "stdout", &actual.stderr, false)?; + "stdout", &actual.stderr, false)?; for expect in self.expect_stdout_contains.iter() { self.match_std(Some(expect), &actual.stdout, "stdout", - &actual.stderr, true)?; + &actual.stderr, true)?; } for expect in self.expect_stderr_contains.iter() { self.match_std(Some(expect), &actual.stderr, "stderr", - &actual.stdout, true)?; + &actual.stdout, true)?; } if let Some(ref objects) = self.expect_json { diff --git a/tests/resolve.rs b/tests/resolve.rs index b40c26f84..15f583b51 100644 --- a/tests/resolve.rs +++ b/tests/resolve.rs @@ -18,9 +18,7 @@ fn resolve(pkg: PackageId, deps: Vec, -> CargoResult> { let summary = Summary::new(pkg.clone(), deps, HashMap::new()).unwrap(); let method = Method::Everything; - Ok(resolver::resolve(&[(summary, method)], - &[], - registry)?.iter().map(|p| { + Ok(resolver::resolve(&[(summary, method)], &[], registry)?.iter().map(|p| { p.clone() }).collect()) } -- 2.39.5