From 04ddd4d0fcea5065612c49f4d09c3b7a0bd83a64 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 6 Dec 2018 20:17:36 +0100 Subject: [PATCH 1/5] Upgrade to Rust 2018 --- Cargo.toml | 1 + src/bin/cargo/cli.rs | 2 +- src/bin/cargo/commands/bench.rs | 2 +- src/bin/cargo/commands/build.rs | 2 +- src/bin/cargo/commands/check.rs | 2 +- src/bin/cargo/commands/clean.rs | 2 +- src/bin/cargo/commands/doc.rs | 2 +- src/bin/cargo/commands/fetch.rs | 2 +- src/bin/cargo/commands/fix.rs | 2 +- src/bin/cargo/commands/generate_lockfile.rs | 2 +- src/bin/cargo/commands/git_checkout.rs | 2 +- src/bin/cargo/commands/init.rs | 2 +- src/bin/cargo/commands/install.rs | 2 +- src/bin/cargo/commands/locate_project.rs | 2 +- src/bin/cargo/commands/login.rs | 2 +- src/bin/cargo/commands/metadata.rs | 2 +- src/bin/cargo/commands/mod.rs | 2 +- src/bin/cargo/commands/new.rs | 2 +- src/bin/cargo/commands/owner.rs | 2 +- src/bin/cargo/commands/package.rs | 2 +- src/bin/cargo/commands/pkgid.rs | 2 +- src/bin/cargo/commands/publish.rs | 2 +- src/bin/cargo/commands/read_manifest.rs | 2 +- src/bin/cargo/commands/run.rs | 2 +- src/bin/cargo/commands/rustc.rs | 2 +- src/bin/cargo/commands/rustdoc.rs | 2 +- src/bin/cargo/commands/search.rs | 2 +- src/bin/cargo/commands/test.rs | 2 +- src/bin/cargo/commands/uninstall.rs | 2 +- src/bin/cargo/commands/update.rs | 2 +- src/bin/cargo/commands/verify_project.rs | 2 +- src/bin/cargo/commands/version.rs | 4 +-- src/bin/cargo/commands/yank.rs | 2 +- src/bin/cargo/main.rs | 2 +- src/cargo/core/compiler/build_config.rs | 2 +- src/cargo/core/compiler/build_context/mod.rs | 10 +++--- .../compiler/build_context/target_info.rs | 4 +-- src/cargo/core/compiler/build_plan.rs | 4 +-- src/cargo/core/compiler/compilation.rs | 6 ++-- .../compiler/context/compilation_files.rs | 4 +-- src/cargo/core/compiler/context/mod.rs | 12 +++---- .../compiler/context/unit_dependencies.rs | 10 +++--- src/cargo/core/compiler/custom_build.rs | 10 +++--- src/cargo/core/compiler/fingerprint.rs | 10 +++--- src/cargo/core/compiler/job.rs | 2 +- src/cargo/core/compiler/job_queue.rs | 16 ++++----- src/cargo/core/compiler/layout.rs | 4 +-- src/cargo/core/compiler/mod.rs | 14 ++++---- src/cargo/core/compiler/output_depinfo.rs | 4 +-- src/cargo/core/dependency.rs | 8 ++--- src/cargo/core/features.rs | 4 +-- src/cargo/core/manifest.rs | 14 ++++---- src/cargo/core/package.rs | 18 +++++----- src/cargo/core/package_id.rs | 12 +++---- src/cargo/core/package_id_spec.rs | 8 ++--- src/cargo/core/profiles.rs | 14 ++++---- src/cargo/core/registry.rs | 10 +++--- src/cargo/core/resolver/conflict_cache.rs | 4 +-- src/cargo/core/resolver/context.rs | 8 ++--- src/cargo/core/resolver/encode.rs | 6 ++-- src/cargo/core/resolver/errors.rs | 6 ++-- src/cargo/core/resolver/mod.rs | 12 +++---- src/cargo/core/resolver/resolve.rs | 6 ++-- src/cargo/core/resolver/types.rs | 8 ++--- src/cargo/core/shell.rs | 2 +- src/cargo/core/source/mod.rs | 4 +-- src/cargo/core/source/source_id.rs | 12 +++---- src/cargo/core/summary.rs | 6 ++-- src/cargo/core/workspace.rs | 20 +++++------ src/cargo/lib.rs | 8 ++--- src/cargo/macros.rs | 2 +- src/cargo/ops/cargo_clean.rs | 14 ++++---- src/cargo/ops/cargo_compile.rs | 18 +++++----- src/cargo/ops/cargo_doc.rs | 6 ++-- src/cargo/ops/cargo_fetch.rs | 10 +++--- src/cargo/ops/cargo_generate_lockfile.rs | 14 ++++---- src/cargo/ops/cargo_install.rs | 26 +++++++------- src/cargo/ops/cargo_new.rs | 8 ++--- src/cargo/ops/cargo_output_metadata.rs | 8 ++--- src/cargo/ops/cargo_package.rs | 14 ++++---- src/cargo/ops/cargo_pkgid.rs | 6 ++-- src/cargo/ops/cargo_read_manifest.rs | 10 +++--- src/cargo/ops/cargo_run.rs | 6 ++-- src/cargo/ops/cargo_test.rs | 10 +++--- src/cargo/ops/fix.rs | 12 +++---- src/cargo/ops/lockfile.rs | 10 +++--- src/cargo/ops/registry.rs | 26 +++++++------- src/cargo/ops/resolve.rs | 14 ++++---- src/cargo/sources/config.rs | 18 +++++----- src/cargo/sources/directory.rs | 12 +++---- src/cargo/sources/git/source.rs | 18 +++++----- src/cargo/sources/git/utils.rs | 34 +++++++++---------- src/cargo/sources/path.rs | 12 +++---- src/cargo/sources/registry/index.rs | 10 +++--- src/cargo/sources/registry/local.rs | 10 +++--- src/cargo/sources/registry/mod.rs | 16 ++++----- src/cargo/sources/registry/remote.rs | 14 ++++---- src/cargo/sources/replaced.rs | 6 ++-- src/cargo/util/cfg.rs | 10 +++--- src/cargo/util/command_prelude.rs | 18 +++++----- src/cargo/util/config.rs | 20 +++++------ src/cargo/util/diagnostic_server.rs | 4 +-- src/cargo/util/errors.rs | 2 +- src/cargo/util/flock.rs | 10 +++--- src/cargo/util/important_paths.rs | 4 +-- src/cargo/util/machine_message.rs | 2 +- src/cargo/util/network.rs | 10 +++--- src/cargo/util/paths.rs | 2 +- src/cargo/util/process_builder.rs | 8 ++--- src/cargo/util/progress.rs | 4 +-- src/cargo/util/rustc.rs | 4 +-- src/cargo/util/to_semver.rs | 2 +- src/cargo/util/to_url.rs | 2 +- src/cargo/util/toml/mod.rs | 20 +++++------ src/cargo/util/toml/targets.rs | 4 +-- src/cargo/util/vcs.rs | 2 +- src/crates-io/Cargo.toml | 1 + tests/testsuite/alt_registry.rs | 4 +-- tests/testsuite/bad_config.rs | 4 +-- tests/testsuite/bad_manifest_path.rs | 2 +- tests/testsuite/bench.rs | 6 ++-- tests/testsuite/build.rs | 10 +++--- tests/testsuite/build_auth.rs | 4 +-- tests/testsuite/build_lib.rs | 2 +- tests/testsuite/build_plan.rs | 4 +-- tests/testsuite/build_script.rs | 8 ++--- tests/testsuite/build_script_env.rs | 4 +-- tests/testsuite/cargo_alias_config.rs | 2 +- tests/testsuite/cargo_command.rs | 8 ++--- tests/testsuite/cargo_features.rs | 2 +- tests/testsuite/cfg.rs | 6 ++-- tests/testsuite/check.rs | 8 ++--- tests/testsuite/clean.rs | 4 +-- tests/testsuite/collisions.rs | 2 +- tests/testsuite/concurrent.rs | 10 +++--- tests/testsuite/config.rs | 2 +- tests/testsuite/corrupt_git.rs | 4 +-- tests/testsuite/cross_compile.rs | 4 +-- tests/testsuite/cross_publish.rs | 2 +- tests/testsuite/custom_target.rs | 4 +-- tests/testsuite/death.rs | 2 +- tests/testsuite/dep_info.rs | 2 +- tests/testsuite/directory.rs | 10 +++--- tests/testsuite/doc.rs | 10 +++--- tests/testsuite/edition.rs | 2 +- tests/testsuite/features.rs | 6 ++-- tests/testsuite/fetch.rs | 6 ++-- tests/testsuite/fix.rs | 6 ++-- tests/testsuite/freshness.rs | 8 ++--- tests/testsuite/generate_lockfile.rs | 4 +-- tests/testsuite/git.rs | 8 ++--- tests/testsuite/init.rs | 4 +-- tests/testsuite/install.rs | 14 ++++---- tests/testsuite/jobserver.rs | 2 +- tests/testsuite/local_registry.rs | 6 ++-- tests/testsuite/lockfile_compat.rs | 6 ++-- tests/testsuite/login.rs | 6 ++-- tests/testsuite/member_errors.rs | 2 +- tests/testsuite/metabuild.rs | 2 +- tests/testsuite/metadata.rs | 4 +-- tests/testsuite/net_config.rs | 2 +- tests/testsuite/new.rs | 4 +-- tests/testsuite/out_dir.rs | 4 +-- tests/testsuite/overrides.rs | 8 ++--- tests/testsuite/package.rs | 6 ++-- tests/testsuite/patch.rs | 8 ++--- tests/testsuite/path.rs | 8 ++--- tests/testsuite/plugins.rs | 4 +-- tests/testsuite/proc_macro.rs | 4 +-- tests/testsuite/profile_config.rs | 2 +- tests/testsuite/profile_overrides.rs | 2 +- tests/testsuite/profile_targets.rs | 4 +-- tests/testsuite/profiles.rs | 4 +-- tests/testsuite/publish.rs | 6 ++-- tests/testsuite/read_manifest.rs | 2 +- tests/testsuite/registry.rs | 10 +++--- tests/testsuite/rename_deps.rs | 8 ++--- tests/testsuite/required_features.rs | 6 ++-- tests/testsuite/resolve.rs | 6 ++-- tests/testsuite/run.rs | 4 +-- tests/testsuite/rustc.rs | 2 +- tests/testsuite/rustc_info_cache.rs | 4 +-- tests/testsuite/rustdoc.rs | 2 +- tests/testsuite/rustdocflags.rs | 2 +- tests/testsuite/rustflags.rs | 4 +-- tests/testsuite/search.rs | 8 ++--- tests/testsuite/shell_quoting.rs | 2 +- tests/testsuite/small_fd_limits.rs | 8 ++--- tests/testsuite/support/cross_compile.rs | 2 +- tests/testsuite/support/git.rs | 2 +- tests/testsuite/support/install.rs | 2 +- tests/testsuite/support/mod.rs | 2 +- tests/testsuite/support/publish.rs | 4 +-- tests/testsuite/support/registry.rs | 4 +-- tests/testsuite/test.rs | 8 ++--- tests/testsuite/tool_paths.rs | 4 +-- tests/testsuite/update.rs | 4 +-- tests/testsuite/verify_project.rs | 2 +- tests/testsuite/version.rs | 2 +- tests/testsuite/warn_on_failure.rs | 4 +-- tests/testsuite/workspaces.rs | 6 ++-- 201 files changed, 631 insertions(+), 629 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d2d48ff76..62883741d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "cargo" version = "0.33.0" +edition = "2018" authors = ["Yehuda Katz ", "Carl Lerche ", "Alex Crichton "] diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs index 246a15445..f60adfe33 100644 --- a/src/bin/cargo/cli.rs +++ b/src/bin/cargo/cli.rs @@ -6,7 +6,7 @@ use cargo::{self, CliResult, Config}; use super::commands; use super::list_commands; -use command_prelude::*; +use crate::command_prelude::*; pub fn main(config: &mut Config) -> CliResult { let args = match cli().get_matches_safe() { diff --git a/src/bin/cargo/commands/bench.rs b/src/bin/cargo/commands/bench.rs index b688e36a5..3846f7b1b 100644 --- a/src/bin/cargo/commands/bench.rs +++ b/src/bin/cargo/commands/bench.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, TestOptions}; diff --git a/src/bin/cargo/commands/build.rs b/src/bin/cargo/commands/build.rs index eac4ae3c0..418d0c53d 100644 --- a/src/bin/cargo/commands/build.rs +++ b/src/bin/cargo/commands/build.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/commands/check.rs b/src/bin/cargo/commands/check.rs index c8715cdfa..a7877b7de 100644 --- a/src/bin/cargo/commands/check.rs +++ b/src/bin/cargo/commands/check.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/commands/clean.rs b/src/bin/cargo/commands/clean.rs index a7606a644..55ba25593 100644 --- a/src/bin/cargo/commands/clean.rs +++ b/src/bin/cargo/commands/clean.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, CleanOptions}; diff --git a/src/bin/cargo/commands/doc.rs b/src/bin/cargo/commands/doc.rs index 3bbcae52b..dac95f376 100644 --- a/src/bin/cargo/commands/doc.rs +++ b/src/bin/cargo/commands/doc.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, DocOptions}; diff --git a/src/bin/cargo/commands/fetch.rs b/src/bin/cargo/commands/fetch.rs index f69ed256b..e777402e8 100644 --- a/src/bin/cargo/commands/fetch.rs +++ b/src/bin/cargo/commands/fetch.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; use cargo::ops::FetchOptions; diff --git a/src/bin/cargo/commands/fix.rs b/src/bin/cargo/commands/fix.rs index b98968b54..adfe16559 100644 --- a/src/bin/cargo/commands/fix.rs +++ b/src/bin/cargo/commands/fix.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, CompileFilter, FilterRule}; diff --git a/src/bin/cargo/commands/generate_lockfile.rs b/src/bin/cargo/commands/generate_lockfile.rs index 6fa6f4429..d473e41af 100644 --- a/src/bin/cargo/commands/generate_lockfile.rs +++ b/src/bin/cargo/commands/generate_lockfile.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/commands/git_checkout.rs b/src/bin/cargo/commands/git_checkout.rs index 80b236293..95c404f04 100644 --- a/src/bin/cargo/commands/git_checkout.rs +++ b/src/bin/cargo/commands/git_checkout.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::core::{GitReference, Source, SourceId}; use cargo::sources::GitSource; diff --git a/src/bin/cargo/commands/init.rs b/src/bin/cargo/commands/init.rs index bc4bf4249..57dc038ec 100644 --- a/src/bin/cargo/commands/init.rs +++ b/src/bin/cargo/commands/init.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/commands/install.rs b/src/bin/cargo/commands/install.rs index be7be8e21..f58caf206 100644 --- a/src/bin/cargo/commands/install.rs +++ b/src/bin/cargo/commands/install.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::core::{GitReference, SourceId}; use cargo::ops; diff --git a/src/bin/cargo/commands/locate_project.rs b/src/bin/cargo/commands/locate_project.rs index bf73a0ae1..9c3e94565 100644 --- a/src/bin/cargo/commands/locate_project.rs +++ b/src/bin/cargo/commands/locate_project.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::print_json; diff --git a/src/bin/cargo/commands/login.rs b/src/bin/cargo/commands/login.rs index 0c7438296..903b96535 100644 --- a/src/bin/cargo/commands/login.rs +++ b/src/bin/cargo/commands/login.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use std::io::{self, BufRead}; diff --git a/src/bin/cargo/commands/metadata.rs b/src/bin/cargo/commands/metadata.rs index 2c3c4286d..c3552201c 100644 --- a/src/bin/cargo/commands/metadata.rs +++ b/src/bin/cargo/commands/metadata.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, OutputMetadataOptions}; use cargo::print_json; diff --git a/src/bin/cargo/commands/mod.rs b/src/bin/cargo/commands/mod.rs index d7d8bc708..6bc89f8ea 100644 --- a/src/bin/cargo/commands/mod.rs +++ b/src/bin/cargo/commands/mod.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; pub fn builtin() -> Vec { vec![ diff --git a/src/bin/cargo/commands/new.rs b/src/bin/cargo/commands/new.rs index 417cebc1b..38b7552a1 100644 --- a/src/bin/cargo/commands/new.rs +++ b/src/bin/cargo/commands/new.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/commands/owner.rs b/src/bin/cargo/commands/owner.rs index fb25124ab..9a08e540e 100644 --- a/src/bin/cargo/commands/owner.rs +++ b/src/bin/cargo/commands/owner.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, OwnersOptions}; diff --git a/src/bin/cargo/commands/package.rs b/src/bin/cargo/commands/package.rs index f5e9d9184..c529fa24e 100644 --- a/src/bin/cargo/commands/package.rs +++ b/src/bin/cargo/commands/package.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, PackageOpts}; diff --git a/src/bin/cargo/commands/pkgid.rs b/src/bin/cargo/commands/pkgid.rs index fd47a5448..41d6275e3 100644 --- a/src/bin/cargo/commands/pkgid.rs +++ b/src/bin/cargo/commands/pkgid.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/commands/publish.rs b/src/bin/cargo/commands/publish.rs index b50d3619c..4053a2b97 100644 --- a/src/bin/cargo/commands/publish.rs +++ b/src/bin/cargo/commands/publish.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, PublishOpts}; diff --git a/src/bin/cargo/commands/read_manifest.rs b/src/bin/cargo/commands/read_manifest.rs index 300bfe9c9..0fe2748cd 100644 --- a/src/bin/cargo/commands/read_manifest.rs +++ b/src/bin/cargo/commands/read_manifest.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::print_json; diff --git a/src/bin/cargo/commands/run.rs b/src/bin/cargo/commands/run.rs index ca55fc6f3..0bc2fb525 100644 --- a/src/bin/cargo/commands/run.rs +++ b/src/bin/cargo/commands/run.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::core::Verbosity; use cargo::ops::{self, CompileFilter}; diff --git a/src/bin/cargo/commands/rustc.rs b/src/bin/cargo/commands/rustc.rs index dd2f1aa2c..9bbb30d45 100644 --- a/src/bin/cargo/commands/rustc.rs +++ b/src/bin/cargo/commands/rustc.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/commands/rustdoc.rs b/src/bin/cargo/commands/rustdoc.rs index 8593bd2d0..c28a6bc2b 100644 --- a/src/bin/cargo/commands/rustdoc.rs +++ b/src/bin/cargo/commands/rustdoc.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, DocOptions}; diff --git a/src/bin/cargo/commands/search.rs b/src/bin/cargo/commands/search.rs index 0501d8e5f..04776cf0b 100644 --- a/src/bin/cargo/commands/search.rs +++ b/src/bin/cargo/commands/search.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use std::cmp::min; diff --git a/src/bin/cargo/commands/test.rs b/src/bin/cargo/commands/test.rs index d581bf61a..a8df32163 100644 --- a/src/bin/cargo/commands/test.rs +++ b/src/bin/cargo/commands/test.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, CompileFilter}; diff --git a/src/bin/cargo/commands/uninstall.rs b/src/bin/cargo/commands/uninstall.rs index fb8fbfb75..189c32fd1 100644 --- a/src/bin/cargo/commands/uninstall.rs +++ b/src/bin/cargo/commands/uninstall.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/commands/update.rs b/src/bin/cargo/commands/update.rs index c5a992a3d..6b2bd59ef 100644 --- a/src/bin/cargo/commands/update.rs +++ b/src/bin/cargo/commands/update.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops::{self, UpdateOptions}; diff --git a/src/bin/cargo/commands/verify_project.rs b/src/bin/cargo/commands/verify_project.rs index b7887591b..dc36eb417 100644 --- a/src/bin/cargo/commands/verify_project.rs +++ b/src/bin/cargo/commands/verify_project.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use std::collections::HashMap; use std::process; diff --git a/src/bin/cargo/commands/version.rs b/src/bin/cargo/commands/version.rs index 350480c02..c85bf4ee9 100644 --- a/src/bin/cargo/commands/version.rs +++ b/src/bin/cargo/commands/version.rs @@ -1,6 +1,6 @@ -use command_prelude::*; +use crate::command_prelude::*; -use cli; +use crate::cli; pub fn cli() -> App { subcommand("version").about("Show version information") diff --git a/src/bin/cargo/commands/yank.rs b/src/bin/cargo/commands/yank.rs index 150474be8..4cc9a9911 100644 --- a/src/bin/cargo/commands/yank.rs +++ b/src/bin/cargo/commands/yank.rs @@ -1,4 +1,4 @@ -use command_prelude::*; +use crate::command_prelude::*; use cargo::ops; diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs index da2b439c7..f19a81b93 100644 --- a/src/bin/cargo/main.rs +++ b/src/bin/cargo/main.rs @@ -28,7 +28,7 @@ use cargo::util::{CliError, ProcessError}; mod cli; mod commands; -use command_prelude::*; +use crate::command_prelude::*; fn main() { #[cfg(feature = "pretty-env-logger")] diff --git a/src/cargo/core/compiler/build_config.rs b/src/cargo/core/compiler/build_config.rs index 7df16e415..38dddc700 100644 --- a/src/cargo/core/compiler/build_config.rs +++ b/src/cargo/core/compiler/build_config.rs @@ -3,7 +3,7 @@ use std::path::Path; use serde::ser; -use util::{CargoResult, CargoResultExt, Config, RustfixDiagnosticServer}; +use crate::util::{CargoResult, CargoResultExt, Config, RustfixDiagnosticServer}; /// Configuration information for a rustc build. #[derive(Debug)] diff --git a/src/cargo/core/compiler/build_context/mod.rs b/src/cargo/core/compiler/build_context/mod.rs index 6373a649a..cd33f4e7d 100644 --- a/src/cargo/core/compiler/build_context/mod.rs +++ b/src/cargo/core/compiler/build_context/mod.rs @@ -3,11 +3,11 @@ use std::env; use std::path::{Path, PathBuf}; use std::str; -use core::profiles::Profiles; -use core::{Dependency, Workspace}; -use core::{PackageId, PackageSet, Resolve}; -use util::errors::CargoResult; -use util::{profile, Cfg, CfgExpr, Config, Rustc}; +use crate::core::profiles::Profiles; +use crate::core::{Dependency, Workspace}; +use crate::core::{PackageId, PackageSet, Resolve}; +use crate::util::errors::CargoResult; +use crate::util::{profile, Cfg, CfgExpr, Config, Rustc}; use super::{BuildConfig, BuildOutput, Kind, Unit}; diff --git a/src/cargo/core/compiler/build_context/target_info.rs b/src/cargo/core/compiler/build_context/target_info.rs index 075c4e622..e263adf2f 100644 --- a/src/cargo/core/compiler/build_context/target_info.rs +++ b/src/cargo/core/compiler/build_context/target_info.rs @@ -5,8 +5,8 @@ use std::str::{self, FromStr}; use super::env_args; use super::Kind; -use core::TargetKind; -use util::{CargoResult, CargoResultExt, Cfg, Config, ProcessBuilder, Rustc}; +use crate::core::TargetKind; +use crate::util::{CargoResult, CargoResultExt, Cfg, Config, ProcessBuilder, Rustc}; #[derive(Clone)] pub struct TargetInfo { diff --git a/src/cargo/core/compiler/build_plan.rs b/src/cargo/core/compiler/build_plan.rs index 3c4b624e8..c30a81e89 100644 --- a/src/cargo/core/compiler/build_plan.rs +++ b/src/cargo/core/compiler/build_plan.rs @@ -10,11 +10,11 @@ use std::collections::BTreeMap; use super::context::OutputFile; use super::{CompileMode, Context, Kind, Unit}; -use core::TargetKind; +use crate::core::TargetKind; use semver; use serde_json; use std::path::PathBuf; -use util::{internal, CargoResult, ProcessBuilder}; +use crate::util::{internal, CargoResult, ProcessBuilder}; #[derive(Debug, Serialize)] struct Invocation { diff --git a/src/cargo/core/compiler/compilation.rs b/src/cargo/core/compiler/compilation.rs index 556c302a9..1ab0ab4e6 100644 --- a/src/cargo/core/compiler/compilation.rs +++ b/src/cargo/core/compiler/compilation.rs @@ -6,8 +6,8 @@ use std::path::PathBuf; use semver::Version; use super::BuildContext; -use core::{Edition, Package, PackageId, Target, TargetKind}; -use util::{self, join_paths, process, CargoResult, CfgExpr, Config, ProcessBuilder}; +use crate::core::{Edition, Package, PackageId, Target, TargetKind}; +use crate::util::{self, join_paths, process, CargoResult, CfgExpr, Config, ProcessBuilder}; pub struct Doctest { /// The package being doctested. @@ -205,7 +205,7 @@ impl<'cfg> Compilation<'cfg> { let metadata = pkg.manifest().metadata(); let cargo_exe = self.config.cargo_exe()?; - cmd.env(::CARGO_ENV, cargo_exe); + cmd.env(crate::CARGO_ENV, cargo_exe); // When adding new environment variables depending on // crate properties which might require rebuild upon change diff --git a/src/cargo/core/compiler/context/compilation_files.rs b/src/cargo/core/compiler/context/compilation_files.rs index c74ae0971..6e7261d6e 100644 --- a/src/cargo/core/compiler/context/compilation_files.rs +++ b/src/cargo/core/compiler/context/compilation_files.rs @@ -8,8 +8,8 @@ use std::sync::Arc; use lazycell::LazyCell; use super::{BuildContext, Context, FileFlavor, Kind, Layout, Unit}; -use core::{TargetKind, Workspace}; -use util::{self, CargoResult}; +use crate::core::{TargetKind, Workspace}; +use crate::util::{self, CargoResult}; #[derive(Clone, Hash, Eq, PartialEq, Ord, PartialOrd)] pub struct Metadata(u64); diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs index 59c7f2f20..27019b20c 100644 --- a/src/cargo/core/compiler/context/mod.rs +++ b/src/cargo/core/compiler/context/mod.rs @@ -7,11 +7,11 @@ use std::sync::Arc; use jobserver::Client; -use core::compiler::compilation; -use core::profiles::Profile; -use core::{Package, PackageId, Resolve, Target}; -use util::errors::{CargoResult, CargoResultExt}; -use util::{internal, profile, short_hash, Config}; +use crate::core::compiler::compilation; +use crate::core::profiles::Profile; +use crate::core::{Package, PackageId, Resolve, Target}; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::{internal, profile, short_hash, Config}; use super::build_plan::BuildPlan; use super::custom_build::{self, BuildDeps, BuildScripts, BuildState}; @@ -514,7 +514,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> { Second unit: {:?}", describe_collision(unit, other_unit, path), suggestion, - ::version(), self.bcx.host_triple(), self.bcx.target_triple(), + crate::version(), self.bcx.host_triple(), self.bcx.target_triple(), unit, other_unit)) } }; diff --git a/src/cargo/core/compiler/context/unit_dependencies.rs b/src/cargo/core/compiler/context/unit_dependencies.rs index 22a4b5f98..55f6247f0 100644 --- a/src/cargo/core/compiler/context/unit_dependencies.rs +++ b/src/cargo/core/compiler/context/unit_dependencies.rs @@ -19,11 +19,11 @@ use std::cell::RefCell; use std::collections::{HashMap, HashSet}; use super::{BuildContext, CompileMode, Kind, Unit}; -use core::dependency::Kind as DepKind; -use core::package::Downloads; -use core::profiles::UnitFor; -use core::{Package, PackageId, Target}; -use CargoResult; +use crate::core::dependency::Kind as DepKind; +use crate::core::package::Downloads; +use crate::core::profiles::UnitFor; +use crate::core::{Package, PackageId, Target}; +use crate::CargoResult; struct State<'a: 'tmp, 'cfg: 'a, 'tmp> { bcx: &'tmp BuildContext<'a, 'cfg>, diff --git a/src/cargo/core/compiler/custom_build.rs b/src/cargo/core/compiler/custom_build.rs index 400bd4641..594e165d0 100644 --- a/src/cargo/core/compiler/custom_build.rs +++ b/src/cargo/core/compiler/custom_build.rs @@ -5,11 +5,11 @@ use std::path::{Path, PathBuf}; use std::str; use std::sync::{Arc, Mutex}; -use core::PackageId; -use util::errors::{CargoResult, CargoResultExt}; -use util::machine_message; -use util::{self, internal, paths, profile}; -use util::{Cfg, Freshness}; +use crate::core::PackageId; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::machine_message; +use crate::util::{self, internal, paths, profile}; +use crate::util::{Cfg, Freshness}; use super::job::Work; use super::{fingerprint, Context, Kind, TargetConfig, Unit}; diff --git a/src/cargo/core/compiler/fingerprint.rs b/src/cargo/core/compiler/fingerprint.rs index 4a3d4fa4f..6d52e482d 100644 --- a/src/cargo/core/compiler/fingerprint.rs +++ b/src/cargo/core/compiler/fingerprint.rs @@ -9,11 +9,11 @@ use serde::de::{self, Deserialize}; use serde::ser; use serde_json; -use core::{Edition, Package}; -use util; -use util::errors::{CargoResult, CargoResultExt}; -use util::paths; -use util::{internal, profile, Dirty, Fresh, Freshness}; +use crate::core::{Edition, Package}; +use crate::util; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::paths; +use crate::util::{internal, profile, Dirty, Fresh, Freshness}; use super::custom_build::BuildDeps; use super::job::Work; diff --git a/src/cargo/core/compiler/job.rs b/src/cargo/core/compiler/job.rs index f51288d4d..8b7e44a1f 100644 --- a/src/cargo/core/compiler/job.rs +++ b/src/cargo/core/compiler/job.rs @@ -1,7 +1,7 @@ use std::fmt; use super::job_queue::JobState; -use util::{CargoResult, Dirty, Fresh, Freshness}; +use crate::util::{CargoResult, Dirty, Fresh, Freshness}; pub struct Job { dirty: Work, diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs index aea810b52..d3bc29f18 100644 --- a/src/cargo/core/compiler/job_queue.rs +++ b/src/cargo/core/compiler/job_queue.rs @@ -11,14 +11,14 @@ use crossbeam_utils; use crossbeam_utils::thread::Scope; use jobserver::{Acquired, HelperThread}; -use core::profiles::Profile; -use core::{PackageId, Target, TargetKind}; -use handle_error; -use util; -use util::diagnostic_server::{self, DiagnosticPrinter}; -use util::{internal, profile, CargoResult, CargoResultExt, ProcessBuilder}; -use util::{Config, DependencyQueue, Dirty, Fresh, Freshness}; -use util::{Progress, ProgressStyle}; +use crate::core::profiles::Profile; +use crate::core::{PackageId, Target, TargetKind}; +use crate::handle_error; +use crate::util; +use crate::util::diagnostic_server::{self, DiagnosticPrinter}; +use crate::util::{internal, profile, CargoResult, CargoResultExt, ProcessBuilder}; +use crate::util::{Config, DependencyQueue, Dirty, Fresh, Freshness}; +use crate::util::{Progress, ProgressStyle}; use super::context::OutputFile; use super::job::Job; diff --git a/src/cargo/core/compiler/layout.rs b/src/cargo/core/compiler/layout.rs index 82784baf3..cf6a8edc2 100644 --- a/src/cargo/core/compiler/layout.rs +++ b/src/cargo/core/compiler/layout.rs @@ -53,8 +53,8 @@ use std::fs; use std::io; use std::path::{Path, PathBuf}; -use core::Workspace; -use util::{CargoResult, Config, FileLock, Filesystem}; +use crate::core::Workspace; +use crate::util::{CargoResult, Config, FileLock, Filesystem}; /// Contains the paths of all target output locations. /// diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index 95497adbc..def252953 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -9,13 +9,13 @@ use failure::Error; use same_file::is_same_file; use serde_json; -use core::manifest::TargetSourcePath; -use core::profiles::{Lto, Profile}; -use core::{PackageId, Target}; -use util::errors::{CargoResult, CargoResultExt, Internal, ProcessError}; -use util::paths; -use util::{self, machine_message, process, Freshness, ProcessBuilder}; -use util::{internal, join_paths, profile}; +use crate::core::manifest::TargetSourcePath; +use crate::core::profiles::{Lto, Profile}; +use crate::core::{PackageId, Target}; +use crate::util::errors::{CargoResult, CargoResultExt, Internal, ProcessError}; +use crate::util::paths; +use crate::util::{self, machine_message, process, Freshness, ProcessBuilder}; +use crate::util::{internal, join_paths, profile}; use self::build_plan::BuildPlan; use self::job::{Job, Work}; diff --git a/src/cargo/core/compiler/output_depinfo.rs b/src/cargo/core/compiler/output_depinfo.rs index ab95ea6f0..6ba421d49 100644 --- a/src/cargo/core/compiler/output_depinfo.rs +++ b/src/cargo/core/compiler/output_depinfo.rs @@ -4,8 +4,8 @@ use std::io::{BufWriter, Write}; use std::path::{Path, PathBuf}; use super::{fingerprint, Context, Unit}; -use util::paths; -use util::{internal, CargoResult}; +use crate::util::paths; +use crate::util::{internal, CargoResult}; fn render_filename>(path: P, basedir: Option<&str>) -> CargoResult { let path = path.as_ref(); diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs index 857411389..ac86ee76e 100644 --- a/src/cargo/core/dependency.rs +++ b/src/cargo/core/dependency.rs @@ -6,10 +6,10 @@ use semver::ReqParseError; use semver::VersionReq; use serde::ser; -use core::interning::InternedString; -use core::{PackageId, SourceId, Summary}; -use util::errors::{CargoError, CargoResult, CargoResultExt}; -use util::{Cfg, CfgExpr, Config}; +use crate::core::interning::InternedString; +use crate::core::{PackageId, SourceId, Summary}; +use crate::util::errors::{CargoError, CargoResult, CargoResultExt}; +use crate::util::{Cfg, CfgExpr, Config}; /// Information about a dependency requested by a Cargo manifest. /// Cheap to copy. diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs index 7f20a4900..d21f52f64 100644 --- a/src/cargo/core/features.rs +++ b/src/cargo/core/features.rs @@ -52,7 +52,7 @@ use std::str::FromStr; use failure::Error; -use util::errors::CargoResult; +use crate::util::errors::CargoResult; /// The edition of the compiler (RFC 2052) #[derive(Clone, Copy, Debug, Hash, PartialOrd, Ord, Eq, PartialEq, Serialize, Deserialize)] @@ -370,7 +370,7 @@ fn channel() -> String { return "dev".to_string(); } } - ::version() + crate::version() .cfg_info .map(|c| c.release_channel) .unwrap_or_else(|| String::from("dev")) diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs index 91eb9e00c..9079474e3 100644 --- a/src/cargo/core/manifest.rs +++ b/src/cargo/core/manifest.rs @@ -9,13 +9,13 @@ use serde::ser; use toml; use url::Url; -use core::interning::InternedString; -use core::profiles::Profiles; -use core::{Dependency, PackageId, PackageIdSpec, SourceId, Summary}; -use core::{Edition, Feature, Features, WorkspaceConfig}; -use util::errors::*; -use util::toml::TomlManifest; -use util::{short_hash, Config, Filesystem}; +use crate::core::interning::InternedString; +use crate::core::profiles::Profiles; +use crate::core::{Dependency, PackageId, PackageIdSpec, SourceId, Summary}; +use crate::core::{Edition, Feature, Features, WorkspaceConfig}; +use crate::util::errors::*; +use crate::util::toml::TomlManifest; +use crate::util::{short_hash, Config, Filesystem}; pub enum EitherManifest { Real(Manifest), diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs index e52d4124b..f6302dc42 100644 --- a/src/cargo/core/package.rs +++ b/src/cargo/core/package.rs @@ -18,14 +18,14 @@ use semver::Version; use serde::ser; use toml; -use core::interning::InternedString; -use core::source::MaybePackage; -use core::{Dependency, Manifest, PackageId, SourceId, Target}; -use core::{FeatureMap, SourceMap, Summary}; -use ops; -use util::errors::{CargoResult, CargoResultExt, HttpNot200}; -use util::network::Retry; -use util::{self, internal, lev_distance, Config, Progress, ProgressStyle}; +use crate::core::interning::InternedString; +use crate::core::source::MaybePackage; +use crate::core::{Dependency, Manifest, PackageId, SourceId, Target}; +use crate::core::{FeatureMap, SourceMap, Summary}; +use crate::ops; +use crate::util::errors::{CargoResult, CargoResultExt, HttpNot200}; +use crate::util::network::Retry; +use crate::util::{self, internal, lev_distance, Config, Progress, ProgressStyle}; /// Information about a package that is available somewhere in the file system. /// @@ -588,7 +588,7 @@ impl<'a, 'cfg> Downloads<'a, 'cfg> { let timed_out = &dl.timed_out; let url = &dl.url; dl.retry - .try(|| { + .r#try(|| { if let Err(e) = result { // If this error is "aborted by callback" then that's // probably because our progress callback aborted due to diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs index 6574e51b2..6fe060959 100644 --- a/src/cargo/core/package_id.rs +++ b/src/cargo/core/package_id.rs @@ -10,9 +10,9 @@ use semver; use serde::de; use serde::ser; -use core::interning::InternedString; -use core::source::SourceId; -use util::{CargoResult, ToSemver}; +use crate::core::interning::InternedString; +use crate::core::source::SourceId; +use crate::util::{CargoResult, ToSemver}; lazy_static! { static ref PACKAGE_ID_CACHE: Mutex> = @@ -202,9 +202,9 @@ impl fmt::Debug for PackageId { #[cfg(test)] mod tests { use super::PackageId; - use core::source::SourceId; - use sources::CRATES_IO_INDEX; - use util::ToUrl; + use crate::core::source::SourceId; + use crate::sources::CRATES_IO_INDEX; + use crate::util::ToUrl; #[test] fn invalid_version_handled_nicely() { diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs index 5597e6c0d..a3400a484 100644 --- a/src/cargo/core/package_id_spec.rs +++ b/src/cargo/core/package_id_spec.rs @@ -5,9 +5,9 @@ use semver::Version; use serde::{de, ser}; use url::Url; -use core::PackageId; -use util::errors::{CargoResult, CargoResultExt}; -use util::{ToSemver, ToUrl}; +use crate::core::PackageId; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::{ToSemver, ToUrl}; /// Some or all of the data required to identify a package: /// @@ -277,7 +277,7 @@ impl<'de> de::Deserialize<'de> for PackageIdSpec { #[cfg(test)] mod tests { use super::PackageIdSpec; - use core::{PackageId, SourceId}; + use crate::core::{PackageId, SourceId}; use semver::Version; use url::Url; diff --git a/src/cargo/core/profiles.rs b/src/cargo/core/profiles.rs index b7c3f3606..1f1e785f4 100644 --- a/src/cargo/core/profiles.rs +++ b/src/cargo/core/profiles.rs @@ -1,13 +1,13 @@ use std::collections::HashSet; use std::{cmp, fmt, hash}; -use core::compiler::CompileMode; -use core::interning::InternedString; -use core::{Features, PackageId, PackageIdSpec, PackageSet, Shell}; -use util::errors::CargoResultExt; -use util::lev_distance::lev_distance; -use util::toml::{ProfilePackageSpec, StringOrBool, TomlProfile, TomlProfiles, U32OrBool}; -use util::{CargoResult, Config}; +use crate::core::compiler::CompileMode; +use crate::core::interning::InternedString; +use crate::core::{Features, PackageId, PackageIdSpec, PackageSet, Shell}; +use crate::util::errors::CargoResultExt; +use crate::util::lev_distance::lev_distance; +use crate::util::toml::{ProfilePackageSpec, StringOrBool, TomlProfile, TomlProfiles, U32OrBool}; +use crate::util::{CargoResult, Config}; /// Collection of all user profiles. #[derive(Clone, Debug)] diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index 97fae9f7a..34a8dc3cf 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -3,11 +3,11 @@ use std::collections::HashMap; use semver::VersionReq; use url::Url; -use core::PackageSet; -use core::{Dependency, PackageId, Source, SourceId, SourceMap, Summary}; -use sources::config::SourceConfigMap; -use util::errors::{CargoResult, CargoResultExt}; -use util::{profile, Config}; +use crate::core::PackageSet; +use crate::core::{Dependency, PackageId, Source, SourceId, SourceMap, Summary}; +use crate::sources::config::SourceConfigMap; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::{profile, Config}; /// Source of information about a group of packages. /// diff --git a/src/cargo/core/resolver/conflict_cache.rs b/src/cargo/core/resolver/conflict_cache.rs index aacab60be..515ffc549 100644 --- a/src/cargo/core/resolver/conflict_cache.rs +++ b/src/cargo/core/resolver/conflict_cache.rs @@ -1,8 +1,8 @@ use std::collections::{BTreeMap, HashMap, HashSet}; use super::types::ConflictReason; -use core::resolver::Context; -use core::{Dependency, PackageId}; +use crate::core::resolver::Context; +use crate::core::{Dependency, PackageId}; /// This is a Trie for storing a large number of Sets designed to /// efficiently see if any of the stored Sets are a subset of a search Set. diff --git a/src/cargo/core/resolver/context.rs b/src/cargo/core/resolver/context.rs index f49b6301f..063bf7af4 100644 --- a/src/cargo/core/resolver/context.rs +++ b/src/cargo/core/resolver/context.rs @@ -1,11 +1,11 @@ use std::collections::{BTreeMap, HashMap, HashSet}; use std::rc::Rc; -use core::interning::InternedString; -use core::{Dependency, FeatureValue, PackageId, SourceId, Summary}; +use crate::core::interning::InternedString; +use crate::core::{Dependency, FeatureValue, PackageId, SourceId, Summary}; use im_rc; -use util::CargoResult; -use util::Graph; +use crate::util::CargoResult; +use crate::util::Graph; use super::errors::ActivateResult; use super::types::{ConflictReason, DepInfo, GraphNode, Method, RcList, RegistryQueryer}; diff --git a/src/cargo/core/resolver/encode.rs b/src/cargo/core/resolver/encode.rs index 84c04f483..170c2aad6 100644 --- a/src/cargo/core/resolver/encode.rs +++ b/src/cargo/core/resolver/encode.rs @@ -5,9 +5,9 @@ use std::str::FromStr; use serde::de; use serde::ser; -use core::{Dependency, Package, PackageId, SourceId, Workspace}; -use util::errors::{CargoError, CargoResult, CargoResultExt}; -use util::{internal, Graph}; +use crate::core::{Dependency, Package, PackageId, SourceId, Workspace}; +use crate::util::errors::{CargoError, CargoResult, CargoResultExt}; +use crate::util::{internal, Graph}; use super::Resolve; diff --git a/src/cargo/core/resolver/errors.rs b/src/cargo/core/resolver/errors.rs index cb5679e7a..37f5e5e13 100644 --- a/src/cargo/core/resolver/errors.rs +++ b/src/cargo/core/resolver/errors.rs @@ -1,11 +1,11 @@ use std::collections::BTreeMap; use std::fmt; -use core::{Dependency, PackageId, Registry, Summary}; +use crate::core::{Dependency, PackageId, Registry, Summary}; use failure::{Error, Fail}; use semver; -use util::lev_distance::lev_distance; -use util::{CargoError, Config}; +use crate::util::lev_distance::lev_distance; +use crate::util::{CargoError, Config}; use super::context::Context; use super::types::{Candidate, ConflictReason}; diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index 6df605cb1..126b4de58 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -54,12 +54,12 @@ use std::time::{Duration, Instant}; use semver; -use core::interning::InternedString; -use core::PackageIdSpec; -use core::{Dependency, PackageId, Registry, Summary}; -use util::config::Config; -use util::errors::CargoResult; -use util::profile; +use crate::core::interning::InternedString; +use crate::core::PackageIdSpec; +use crate::core::{Dependency, PackageId, Registry, Summary}; +use crate::util::config::Config; +use crate::util::errors::CargoResult; +use crate::util::profile; use self::context::{Activations, Context}; use self::types::{Candidate, ConflictReason, DepsFrame, GraphNode}; diff --git a/src/cargo/core/resolver/resolve.rs b/src/cargo/core/resolver/resolve.rs index 1b2e8dcb9..1d4ba211d 100644 --- a/src/cargo/core/resolver/resolve.rs +++ b/src/cargo/core/resolver/resolve.rs @@ -6,9 +6,9 @@ use std::iter::FromIterator; use url::Url; -use core::{Dependency, PackageId, PackageIdSpec, Summary, Target}; -use util::errors::CargoResult; -use util::Graph; +use crate::core::{Dependency, PackageId, PackageIdSpec, Summary, Target}; +use crate::util::errors::CargoResult; +use crate::util::Graph; use super::encode::Metadata; diff --git a/src/cargo/core/resolver/types.rs b/src/cargo/core/resolver/types.rs index b9923bf77..d6c6ce981 100644 --- a/src/cargo/core/resolver/types.rs +++ b/src/cargo/core/resolver/types.rs @@ -4,10 +4,10 @@ use std::ops::Range; use std::rc::Rc; use std::time::{Duration, Instant}; -use core::interning::InternedString; -use core::{Dependency, PackageId, PackageIdSpec, Registry, Summary}; -use util::errors::CargoResult; -use util::Config; +use crate::core::interning::InternedString; +use crate::core::{Dependency, PackageId, PackageIdSpec, Registry, Summary}; +use crate::util::errors::CargoResult; +use crate::util::Config; use im_rc; diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs index cda5a2dce..88ac543be 100644 --- a/src/cargo/core/shell.rs +++ b/src/cargo/core/shell.rs @@ -5,7 +5,7 @@ use atty; use termcolor::Color::{Cyan, Green, Red, Yellow}; use termcolor::{self, Color, ColorSpec, StandardStream, WriteColor}; -use util::errors::CargoResult; +use crate::util::errors::CargoResult; /// The requested verbosity of output #[derive(Debug, Clone, Copy, PartialEq)] diff --git a/src/cargo/core/source/mod.rs b/src/cargo/core/source/mod.rs index 5617fe65e..3fac9acec 100644 --- a/src/cargo/core/source/mod.rs +++ b/src/cargo/core/source/mod.rs @@ -1,8 +1,8 @@ use std::collections::hash_map::HashMap; use std::fmt; -use core::{Dependency, Package, PackageId, Summary}; -use util::CargoResult; +use crate::core::{Dependency, Package, PackageId, Summary}; +use crate::util::CargoResult; mod source_id; diff --git a/src/cargo/core/source/source_id.rs b/src/cargo/core/source/source_id.rs index 93766c4b0..1f4c1c067 100644 --- a/src/cargo/core/source/source_id.rs +++ b/src/cargo/core/source/source_id.rs @@ -12,11 +12,11 @@ use serde::de; use serde::ser; use url::Url; -use ops; -use sources::git; -use sources::DirectorySource; -use sources::{GitSource, PathSource, RegistrySource, CRATES_IO_INDEX}; -use util::{CargoResult, Config, ToUrl}; +use crate::ops; +use crate::sources::git; +use crate::sources::DirectorySource; +use crate::sources::{GitSource, PathSource, RegistrySource, CRATES_IO_INDEX}; +use crate::util::{CargoResult, Config, ToUrl}; lazy_static! { static ref SOURCE_ID_CACHE: Mutex> = Mutex::new(HashSet::new()); @@ -579,7 +579,7 @@ impl<'a> fmt::Display for PrettyRef<'a> { #[cfg(test)] mod tests { use super::{GitReference, Kind, SourceId}; - use util::ToUrl; + use crate::util::ToUrl; #[test] fn github_sources_equal() { diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs index 087903107..bcf1b2538 100644 --- a/src/cargo/core/summary.rs +++ b/src/cargo/core/summary.rs @@ -6,11 +6,11 @@ use std::rc::Rc; use serde::{Serialize, Serializer}; -use core::interning::InternedString; -use core::{Dependency, PackageId, SourceId}; +use crate::core::interning::InternedString; +use crate::core::{Dependency, PackageId, SourceId}; use semver::Version; -use util::CargoResult; +use crate::util::CargoResult; /// Subset of a `Manifest`. Contains only the most important information about /// a package. diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index 1b29eb620..d706c35b6 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -7,16 +7,16 @@ use std::slice; use glob::glob; use url::Url; -use core::profiles::Profiles; -use core::registry::PackageRegistry; -use core::{Dependency, PackageIdSpec}; -use core::{EitherManifest, Package, SourceId, VirtualManifest}; -use ops; -use sources::PathSource; -use util::errors::{CargoResult, CargoResultExt, ManifestError}; -use util::paths; -use util::toml::read_manifest; -use util::{Config, Filesystem}; +use crate::core::profiles::Profiles; +use crate::core::registry::PackageRegistry; +use crate::core::{Dependency, PackageIdSpec}; +use crate::core::{EitherManifest, Package, SourceId, VirtualManifest}; +use crate::ops; +use crate::sources::PathSource; +use crate::util::errors::{CargoResult, CargoResultExt, ManifestError}; +use crate::util::paths; +use crate::util::toml::read_manifest; +use crate::util::{Config, Filesystem}; /// The core abstraction in Cargo for working with a workspace of crates. /// diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index fe3f7f0ef..f5253666d 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -68,11 +68,11 @@ use std::fmt; use failure::Error; use serde::ser; -use core::shell::Verbosity::Verbose; -use core::Shell; +use crate::core::shell::Verbosity::Verbose; +use crate::core::Shell; -pub use util::errors::Internal; -pub use util::{CargoError, CargoResult, CliError, CliResult, Config}; +pub use crate::util::errors::Internal; +pub use crate::util::{CargoError, CargoResult, CliError, CliResult, Config}; pub const CARGO_ENV: &str = "CARGO"; diff --git a/src/cargo/macros.rs b/src/cargo/macros.rs index 17529ee0a..eec27477b 100644 --- a/src/cargo/macros.rs +++ b/src/cargo/macros.rs @@ -32,7 +32,7 @@ macro_rules! compact_debug { )* if any_default { - s.field("..", &::macros::DisplayAsDebug(default_name)); + s.field("..", &crate::macros::DisplayAsDebug(default_name)); } s.finish() } diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs index b42c2cb4a..f455b02ef 100644 --- a/src/cargo/ops/cargo_clean.rs +++ b/src/cargo/ops/cargo_clean.rs @@ -2,13 +2,13 @@ use std::collections::HashMap; use std::fs; use std::path::Path; -use core::compiler::{BuildConfig, BuildContext, CompileMode, Context, Kind, Unit}; -use core::profiles::UnitFor; -use core::Workspace; -use ops; -use util::errors::{CargoResult, CargoResultExt}; -use util::paths; -use util::Config; +use crate::core::compiler::{BuildConfig, BuildContext, CompileMode, Context, Kind, Unit}; +use crate::core::profiles::UnitFor; +use crate::core::Workspace; +use crate::ops; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::paths; +use crate::util::Config; pub struct CleanOptions<'a> { pub config: &'a Config, diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index c1abb9348..d6bfaf78b 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -26,15 +26,15 @@ use std::collections::{HashMap, HashSet}; use std::path::PathBuf; use std::sync::Arc; -use core::compiler::{BuildConfig, BuildContext, Compilation, Context, DefaultExecutor, Executor}; -use core::compiler::{CompileMode, Kind, Unit}; -use core::profiles::{Profiles, UnitFor}; -use core::resolver::{Method, Resolve}; -use core::{Package, Source, Target}; -use core::{PackageId, PackageIdSpec, TargetKind, Workspace}; -use ops; -use util::config::Config; -use util::{lev_distance, profile, CargoResult}; +use crate::core::compiler::{BuildConfig, BuildContext, Compilation, Context, DefaultExecutor, Executor}; +use crate::core::compiler::{CompileMode, Kind, Unit}; +use crate::core::profiles::{Profiles, UnitFor}; +use crate::core::resolver::{Method, Resolve}; +use crate::core::{Package, Source, Target}; +use crate::core::{PackageId, PackageIdSpec, TargetKind, Workspace}; +use crate::ops; +use crate::util::config::Config; +use crate::util::{lev_distance, profile, CargoResult}; /// Contains information about how a package should be compiled. #[derive(Debug)] diff --git a/src/cargo/ops/cargo_doc.rs b/src/cargo/ops/cargo_doc.rs index c6d5daff9..812120410 100644 --- a/src/cargo/ops/cargo_doc.rs +++ b/src/cargo/ops/cargo_doc.rs @@ -5,9 +5,9 @@ use std::path::Path; use failure::Fail; use opener; -use core::Workspace; -use ops; -use util::CargoResult; +use crate::core::Workspace; +use crate::ops; +use crate::util::CargoResult; /// Strongly typed options for the `cargo doc` command. #[derive(Debug)] diff --git a/src/cargo/ops/cargo_fetch.rs b/src/cargo/ops/cargo_fetch.rs index de0df3847..670014e79 100644 --- a/src/cargo/ops/cargo_fetch.rs +++ b/src/cargo/ops/cargo_fetch.rs @@ -1,9 +1,9 @@ -use core::compiler::{BuildConfig, CompileMode, Kind, TargetInfo}; -use core::{PackageSet, Resolve, Workspace}; -use ops; +use crate::core::compiler::{BuildConfig, CompileMode, Kind, TargetInfo}; +use crate::core::{PackageSet, Resolve, Workspace}; +use crate::ops; use std::collections::HashSet; -use util::CargoResult; -use util::Config; +use crate::util::CargoResult; +use crate::util::Config; pub struct FetchOptions<'a> { pub config: &'a Config, diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index 5ea5fb4d6..d62c133d4 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -2,13 +2,13 @@ use std::collections::{BTreeMap, HashSet}; use termcolor::Color::{self, Cyan, Green, Red}; -use core::registry::PackageRegistry; -use core::resolver::Method; -use core::PackageId; -use core::{Resolve, SourceId, Workspace}; -use ops; -use util::config::Config; -use util::CargoResult; +use crate::core::registry::PackageRegistry; +use crate::core::resolver::Method; +use crate::core::PackageId; +use crate::core::{Resolve, SourceId, Workspace}; +use crate::ops; +use crate::util::config::Config; +use crate::util::CargoResult; pub struct UpdateOptions<'a> { pub config: &'a Config, diff --git a/src/cargo/ops/cargo_install.rs b/src/cargo/ops/cargo_install.rs index 815ae44f6..7e81c35bf 100644 --- a/src/cargo/ops/cargo_install.rs +++ b/src/cargo/ops/cargo_install.rs @@ -10,17 +10,17 @@ use semver::{Version, VersionReq}; use tempfile::Builder as TempFileBuilder; use toml; -use core::compiler::{DefaultExecutor, Executor}; -use core::package::PackageSet; -use core::source::SourceMap; -use core::{Dependency, Edition, Package, PackageIdSpec, Source, SourceId}; -use core::{PackageId, Workspace}; -use ops::{self, CompileFilter}; -use sources::{GitSource, PathSource, SourceConfigMap}; -use util::errors::{CargoResult, CargoResultExt}; -use util::paths; -use util::{internal, Config}; -use util::{FileLock, Filesystem}; +use crate::core::compiler::{DefaultExecutor, Executor}; +use crate::core::package::PackageSet; +use crate::core::source::SourceMap; +use crate::core::{Dependency, Edition, Package, PackageIdSpec, Source, SourceId}; +use crate::core::{PackageId, Workspace}; +use crate::ops::{self, CompileFilter}; +use crate::sources::{GitSource, PathSource, SourceConfigMap}; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::paths; +use crate::util::{internal, Config}; +use crate::util::{FileLock, Filesystem}; #[derive(Deserialize, Serialize)] #[serde(untagged)] @@ -101,7 +101,7 @@ pub fn install( ) { Ok(()) => succeeded.push(krate), Err(e) => { - ::handle_error(&e, &mut opts.config.shell()); + crate::handle_error(&e, &mut opts.config.shell()); failed.push(krate) } } @@ -731,7 +731,7 @@ pub fn uninstall( match uninstall_one(&root, spec, bins, config) { Ok(()) => succeeded.push(spec), Err(e) => { - ::handle_error(&e, &mut config.shell()); + crate::handle_error(&e, &mut config.shell()); failed.push(spec) } } diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs index abcc0f380..106775831 100644 --- a/src/cargo/ops/cargo_new.rs +++ b/src/cargo/ops/cargo_new.rs @@ -7,10 +7,10 @@ use std::path::{Path, PathBuf}; use git2::Config as GitConfig; use git2::Repository as GitRepository; -use core::{compiler, Workspace}; -use util::errors::{CargoResult, CargoResultExt}; -use util::{existing_vcs_repo, internal, FossilRepo, GitRepo, HgRepo, PijulRepo}; -use util::{paths, Config}; +use crate::core::{compiler, Workspace}; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::{existing_vcs_repo, internal, FossilRepo, GitRepo, HgRepo, PijulRepo}; +use crate::util::{paths, Config}; use toml; diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs index 7f9970d43..dd2c9065c 100644 --- a/src/cargo/ops/cargo_output_metadata.rs +++ b/src/cargo/ops/cargo_output_metadata.rs @@ -2,10 +2,10 @@ use std::collections::HashMap; use serde::ser; -use core::resolver::Resolve; -use core::{Package, PackageId, Workspace}; -use ops::{self, Packages}; -use util::CargoResult; +use crate::core::resolver::Resolve; +use crate::core::{Package, PackageId, Workspace}; +use crate::ops::{self, Packages}; +use crate::util::CargoResult; const VERSION: u32 = 1; diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs index 90d62af6f..3957c3fe0 100644 --- a/src/cargo/ops/cargo_package.rs +++ b/src/cargo/ops/cargo_package.rs @@ -10,13 +10,13 @@ use git2; use serde_json; use tar::{Archive, Builder, EntryType, Header}; -use core::compiler::{BuildConfig, CompileMode, DefaultExecutor, Executor}; -use core::{Package, Source, SourceId, Workspace}; -use ops; -use sources::PathSource; -use util::errors::{CargoResult, CargoResultExt}; -use util::paths; -use util::{self, internal, Config, FileLock}; +use crate::core::compiler::{BuildConfig, CompileMode, DefaultExecutor, Executor}; +use crate::core::{Package, Source, SourceId, Workspace}; +use crate::ops; +use crate::sources::PathSource; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::paths; +use crate::util::{self, internal, Config, FileLock}; pub struct PackageOpts<'cfg> { pub config: &'cfg Config, diff --git a/src/cargo/ops/cargo_pkgid.rs b/src/cargo/ops/cargo_pkgid.rs index 1d55f1549..48f717a5a 100644 --- a/src/cargo/ops/cargo_pkgid.rs +++ b/src/cargo/ops/cargo_pkgid.rs @@ -1,6 +1,6 @@ -use core::{PackageIdSpec, Workspace}; -use ops; -use util::CargoResult; +use crate::core::{PackageIdSpec, Workspace}; +use crate::ops; +use crate::util::CargoResult; pub fn pkgid(ws: &Workspace, spec: Option<&str>) -> CargoResult { let resolve = match ops::load_pkg_lockfile(ws)? { diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs index 0e1913e05..33f19fb46 100644 --- a/src/cargo/ops/cargo_read_manifest.rs +++ b/src/cargo/ops/cargo_read_manifest.rs @@ -3,11 +3,11 @@ use std::fs; use std::io; use std::path::{Path, PathBuf}; -use core::{EitherManifest, Package, PackageId, SourceId}; -use util::errors::{CargoError, CargoResult}; -use util::important_paths::find_project_manifest_exact; -use util::toml::read_manifest; -use util::{self, Config}; +use crate::core::{EitherManifest, Package, PackageId, SourceId}; +use crate::util::errors::{CargoError, CargoResult}; +use crate::util::important_paths::find_project_manifest_exact; +use crate::util::toml::read_manifest; +use crate::util::{self, Config}; pub fn read_package( path: &Path, diff --git a/src/cargo/ops/cargo_run.rs b/src/cargo/ops/cargo_run.rs index 08336d9aa..42a7074c5 100644 --- a/src/cargo/ops/cargo_run.rs +++ b/src/cargo/ops/cargo_run.rs @@ -1,9 +1,9 @@ use std::iter; use std::path::Path; -use ops; -use util::{self, CargoResult, ProcessError}; -use core::{TargetKind, Workspace, nightly_features_allowed}; +use crate::ops; +use crate::util::{self, CargoResult, ProcessError}; +use crate::core::{TargetKind, Workspace, nightly_features_allowed}; pub fn run( ws: &Workspace, diff --git a/src/cargo/ops/cargo_test.rs b/src/cargo/ops/cargo_test.rs index 2b7f8f57c..345af8c35 100644 --- a/src/cargo/ops/cargo_test.rs +++ b/src/cargo/ops/cargo_test.rs @@ -1,10 +1,10 @@ use std::ffi::OsString; -use core::compiler::{Compilation, Doctest}; -use core::Workspace; -use ops; -use util::errors::CargoResult; -use util::{self, CargoTestError, ProcessError, Test}; +use crate::core::compiler::{Compilation, Doctest}; +use crate::core::Workspace; +use crate::ops; +use crate::util::errors::CargoResult; +use crate::util::{self, CargoTestError, ProcessError, Test}; pub struct TestOptions<'a> { pub compile_opts: ops::CompileOptions<'a>, diff --git a/src/cargo/ops/fix.rs b/src/cargo/ops/fix.rs index 734ed5445..5bb912f07 100644 --- a/src/cargo/ops/fix.rs +++ b/src/cargo/ops/fix.rs @@ -12,12 +12,12 @@ use rustfix::diagnostics::Diagnostic; use rustfix::{self, CodeFix}; use serde_json; -use core::Workspace; -use ops::{self, CompileOptions}; -use util::diagnostic_server::{Message, RustfixDiagnosticServer}; -use util::errors::CargoResult; -use util::paths; -use util::{existing_vcs_repo, LockServer, LockServerClient}; +use crate::core::Workspace; +use crate::ops::{self, CompileOptions}; +use crate::util::diagnostic_server::{Message, RustfixDiagnosticServer}; +use crate::util::errors::CargoResult; +use crate::util::paths; +use crate::util::{existing_vcs_repo, LockServer, LockServerClient}; const FIX_ENV: &str = "__CARGO_FIX_PLZ"; const BROKEN_CODE_ENV: &str = "__CARGO_FIX_BROKEN_CODE"; diff --git a/src/cargo/ops/lockfile.rs b/src/cargo/ops/lockfile.rs index 92ac5e1e3..bf8a7ffa6 100644 --- a/src/cargo/ops/lockfile.rs +++ b/src/cargo/ops/lockfile.rs @@ -2,11 +2,11 @@ use std::io::prelude::*; use toml; -use core::resolver::WorkspaceResolve; -use core::{resolver, Resolve, Workspace}; -use util::errors::{CargoResult, CargoResultExt}; -use util::toml as cargo_toml; -use util::Filesystem; +use crate::core::resolver::WorkspaceResolve; +use crate::core::{resolver, Resolve, Workspace}; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::toml as cargo_toml; +use crate::util::Filesystem; pub fn load_pkg_lockfile(ws: &Workspace) -> CargoResult> { if !ws.root().join("Cargo.lock").exists() { diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs index 946e61fb6..a450c719a 100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs @@ -8,22 +8,22 @@ use std::{cmp, env}; use curl::easy::{Easy, InfoType, SslOpt}; use git2; use log::Level; -use registry::{NewCrate, NewCrateDependency, Registry}; +use crate::registry::{NewCrate, NewCrateDependency, Registry}; use url::percent_encoding::{percent_encode, QUERY_ENCODE_SET}; -use core::dependency::Kind; -use core::manifest::ManifestMetadata; -use core::source::Source; -use core::{Package, SourceId, Workspace}; -use ops; -use sources::{RegistrySource, SourceConfigMap}; -use util::config::{self, Config}; -use util::errors::{CargoResult, CargoResultExt}; -use util::important_paths::find_root_manifest_for_wd; -use util::paths; -use util::ToUrl; -use version; +use crate::core::dependency::Kind; +use crate::core::manifest::ManifestMetadata; +use crate::core::source::Source; +use crate::core::{Package, SourceId, Workspace}; +use crate::ops; +use crate::sources::{RegistrySource, SourceConfigMap}; +use crate::util::config::{self, Config}; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::important_paths::find_root_manifest_for_wd; +use crate::util::paths; +use crate::util::ToUrl; +use crate::version; pub struct RegistryConfig { pub index: Option, diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs index 84a9e6511..dd6b786eb 100644 --- a/src/cargo/ops/resolve.rs +++ b/src/cargo/ops/resolve.rs @@ -1,12 +1,12 @@ use std::collections::HashSet; -use core::registry::PackageRegistry; -use core::resolver::{self, Method, Resolve}; -use core::{PackageId, PackageIdSpec, PackageSet, Source, SourceId, Workspace}; -use ops; -use sources::PathSource; -use util::errors::{CargoResult, CargoResultExt}; -use util::profile; +use crate::core::registry::PackageRegistry; +use crate::core::resolver::{self, Method, Resolve}; +use crate::core::{PackageId, PackageIdSpec, PackageSet, Source, SourceId, Workspace}; +use crate::ops; +use crate::sources::PathSource; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::profile; /// Resolve all dependencies for the workspace using the previous /// lockfile as a guide if present. diff --git a/src/cargo/sources/config.rs b/src/cargo/sources/config.rs index e70a2f874..140583812 100644 --- a/src/cargo/sources/config.rs +++ b/src/cargo/sources/config.rs @@ -9,11 +9,11 @@ use std::path::{Path, PathBuf}; use url::Url; -use core::{GitReference, Source, SourceId}; -use sources::{ReplacedSource, CRATES_IO_REGISTRY}; -use util::config::ConfigValue; -use util::errors::{CargoResult, CargoResultExt}; -use util::{Config, ToUrl}; +use crate::core::{GitReference, Source, SourceId}; +use crate::sources::{ReplacedSource, CRATES_IO_REGISTRY}; +use crate::util::config::ConfigValue; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::{Config, ToUrl}; #[derive(Clone)] pub struct SourceConfigMap<'cfg> { @@ -176,7 +176,7 @@ restore the source replacement configuration to continue the build } if let Some(val) = table.get("git") { let url = url(val, &format!("source.{}.git", name))?; - let try = |s: &str| { + let r#try = |s: &str| { let val = match table.get(s) { Some(s) => s, None => return Ok(None), @@ -184,11 +184,11 @@ restore the source replacement configuration to continue the build let key = format!("source.{}.{}", name, s); val.string(&key).map(Some) }; - let reference = match try("branch")? { + let reference = match r#try("branch")? { Some(b) => GitReference::Branch(b.0.to_string()), - None => match try("tag")? { + None => match r#try("tag")? { Some(b) => GitReference::Tag(b.0.to_string()), - None => match try("rev")? { + None => match r#try("rev")? { Some(b) => GitReference::Rev(b.0.to_string()), None => GitReference::Branch("master".to_string()), }, diff --git a/src/cargo/sources/directory.rs b/src/cargo/sources/directory.rs index 00ffe8931..493be8db4 100644 --- a/src/cargo/sources/directory.rs +++ b/src/cargo/sources/directory.rs @@ -8,12 +8,12 @@ use hex; use serde_json; -use core::source::MaybePackage; -use core::{Dependency, Package, PackageId, Source, SourceId, Summary}; -use sources::PathSource; -use util::errors::{CargoResult, CargoResultExt}; -use util::paths; -use util::{Config, Sha256}; +use crate::core::source::MaybePackage; +use crate::core::{Dependency, Package, PackageId, Source, SourceId, Summary}; +use crate::sources::PathSource; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::paths; +use crate::util::{Config, Sha256}; pub struct DirectorySource<'cfg> { source_id: SourceId, diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs index 49001dd90..b5a601ae9 100644 --- a/src/cargo/sources/git/source.rs +++ b/src/cargo/sources/git/source.rs @@ -2,14 +2,14 @@ use std::fmt::{self, Debug, Formatter}; use url::Url; -use core::source::{MaybePackage, Source, SourceId}; -use core::GitReference; -use core::{Dependency, Package, PackageId, Summary}; -use sources::git::utils::{GitRemote, GitRevision}; -use sources::PathSource; -use util::errors::CargoResult; -use util::hex::short_hash; -use util::Config; +use crate::core::source::{MaybePackage, Source, SourceId}; +use crate::core::GitReference; +use crate::core::{Dependency, Package, PackageId, Summary}; +use crate::sources::git::utils::{GitRemote, GitRevision}; +use crate::sources::PathSource; +use crate::util::errors::CargoResult; +use crate::util::hex::short_hash; +use crate::util::Config; pub struct GitSource<'cfg> { remote: GitRemote, @@ -243,7 +243,7 @@ impl<'cfg> Source for GitSource<'cfg> { mod test { use super::ident; use url::Url; - use util::ToUrl; + use crate::util::ToUrl; #[test] pub fn test_url_to_path_ident_with_path() { diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs index 7f36f036d..423d68b1f 100644 --- a/src/cargo/sources/git/utils.rs +++ b/src/cargo/sources/git/utils.rs @@ -10,11 +10,11 @@ use git2::{self, ObjectType}; use serde::ser; use url::Url; -use core::GitReference; -use util::errors::{CargoError, CargoResult, CargoResultExt}; -use util::paths; -use util::process_builder::process; -use util::{internal, network, Config, Progress, ToUrl}; +use crate::core::GitReference; +use crate::util::errors::{CargoError, CargoResult, CargoResultExt}; +use crate::util::paths; +use crate::util::process_builder::process; +use crate::util::{internal, network, Config, Progress, ToUrl}; #[derive(PartialEq, Clone, Debug)] pub struct GitRevision(git2::Oid); @@ -875,7 +875,7 @@ fn init(path: &Path, bare: bool) -> CargoResult { /// just return a `bool`. Any real errors will be reported through the normal /// update path above. fn github_up_to_date(handle: &mut Easy, url: &Url, oid: &git2::Oid) -> bool { - macro_rules! try { + macro_rules! r#try { ($e:expr) => (match $e { Some(e) => e, None => return false, @@ -884,9 +884,9 @@ fn github_up_to_date(handle: &mut Easy, url: &Url, oid: &git2::Oid) -> bool { // This expects GitHub urls in the form `github.com/user/repo` and nothing // else - let mut pieces = try!(url.path_segments()); - let username = try!(pieces.next()); - let repo = try!(pieces.next()); + let mut pieces = r#try!(url.path_segments()); + let username = r#try!(pieces.next()); + let repo = r#try!(pieces.next()); if pieces.next().is_some() { return false; } @@ -895,14 +895,14 @@ fn github_up_to_date(handle: &mut Easy, url: &Url, oid: &git2::Oid) -> bool { "https://api.github.com/repos/{}/{}/commits/master", username, repo ); - try!(handle.get(true).ok()); - try!(handle.url(&url).ok()); - try!(handle.useragent("cargo").ok()); + r#try!(handle.get(true).ok()); + r#try!(handle.url(&url).ok()); + r#try!(handle.useragent("cargo").ok()); let mut headers = List::new(); - try!(headers.append("Accept: application/vnd.github.3.sha").ok()); - try!(headers.append(&format!("If-None-Match: \"{}\"", oid)).ok()); - try!(handle.http_headers(headers).ok()); - try!(handle.perform().ok()); + r#try!(headers.append("Accept: application/vnd.github.3.sha").ok()); + r#try!(headers.append(&format!("If-None-Match: \"{}\"", oid)).ok()); + r#try!(handle.http_headers(headers).ok()); + r#try!(handle.perform().ok()); - try!(handle.response_code().ok()) == 304 + r#try!(handle.response_code().ok()) == 304 } diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index 7a6823c3e..d34cd3ba2 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -8,12 +8,12 @@ use glob::Pattern; use ignore::gitignore::GitignoreBuilder; use ignore::Match; -use core::source::MaybePackage; -use core::{Dependency, Package, PackageId, Source, SourceId, Summary}; -use ops; -use util::paths; -use util::Config; -use util::{self, internal, CargoResult}; +use crate::core::source::MaybePackage; +use crate::core::{Dependency, Package, PackageId, Source, SourceId, Summary}; +use crate::ops; +use crate::util::paths; +use crate::util::Config; +use crate::util::{self, internal, CargoResult}; pub struct PathSource<'cfg> { source_id: SourceId, diff --git a/src/cargo/sources/registry/index.rs b/src/cargo/sources/registry/index.rs index 9fdf9eee1..2331b1eff 100644 --- a/src/cargo/sources/registry/index.rs +++ b/src/cargo/sources/registry/index.rs @@ -5,11 +5,11 @@ use std::str; use semver::Version; use serde_json; -use core::dependency::Dependency; -use core::{PackageId, SourceId, Summary}; -use sources::registry::RegistryData; -use sources::registry::{RegistryPackage, INDEX_LOCK}; -use util::{internal, CargoResult, Config, Filesystem}; +use crate::core::dependency::Dependency; +use crate::core::{PackageId, SourceId, Summary}; +use crate::sources::registry::RegistryData; +use crate::sources::registry::{RegistryPackage, INDEX_LOCK}; +use crate::util::{internal, CargoResult, Config, Filesystem}; /// Crates.io treats hyphen and underscores as interchangeable /// but, the index and old cargo do not. So the index must store uncanonicalized version diff --git a/src/cargo/sources/registry/local.rs b/src/cargo/sources/registry/local.rs index cea6690f3..e3865257b 100644 --- a/src/cargo/sources/registry/local.rs +++ b/src/cargo/sources/registry/local.rs @@ -2,12 +2,12 @@ use std::io::prelude::*; use std::io::SeekFrom; use std::path::Path; -use core::PackageId; +use crate::core::PackageId; use hex; -use sources::registry::{MaybeLock, RegistryConfig, RegistryData}; -use util::errors::{CargoResult, CargoResultExt}; -use util::paths; -use util::{Config, FileLock, Filesystem, Sha256}; +use crate::sources::registry::{MaybeLock, RegistryConfig, RegistryData}; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::paths; +use crate::util::{Config, FileLock, Filesystem, Sha256}; pub struct LocalRegistry<'cfg> { index_path: Filesystem, diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs index d0e3fc32c..2cacd1ce8 100644 --- a/src/cargo/sources/registry/mod.rs +++ b/src/cargo/sources/registry/mod.rs @@ -169,14 +169,14 @@ use semver::Version; use serde_json; use tar::Archive; -use core::dependency::{Dependency, Kind}; -use core::source::MaybePackage; -use core::{Package, PackageId, Source, SourceId, Summary}; -use sources::PathSource; -use util::errors::CargoResultExt; -use util::hex; -use util::to_url::ToUrl; -use util::{internal, CargoResult, Config, FileLock, Filesystem}; +use crate::core::dependency::{Dependency, Kind}; +use crate::core::source::MaybePackage; +use crate::core::{Package, PackageId, Source, SourceId, Summary}; +use crate::sources::PathSource; +use crate::util::errors::CargoResultExt; +use crate::util::hex; +use crate::util::to_url::ToUrl; +use crate::util::{internal, CargoResult, Config, FileLock, Filesystem}; const INDEX_LOCK: &str = ".cargo-index-lock"; pub const CRATES_IO_INDEX: &str = "https://github.com/rust-lang/crates.io-index"; diff --git a/src/cargo/sources/registry/remote.rs b/src/cargo/sources/registry/remote.rs index 6f9c2b61f..14b29bc44 100644 --- a/src/cargo/sources/registry/remote.rs +++ b/src/cargo/sources/registry/remote.rs @@ -11,15 +11,15 @@ use hex; use lazycell::LazyCell; use serde_json; -use core::{PackageId, SourceId}; -use sources::git; -use sources::registry::MaybeLock; -use sources::registry::{ +use crate::core::{PackageId, SourceId}; +use crate::sources::git; +use crate::sources::registry::MaybeLock; +use crate::sources::registry::{ RegistryConfig, RegistryData, CRATE_TEMPLATE, INDEX_LOCK, VERSION_TEMPLATE, }; -use util::errors::{CargoResult, CargoResultExt}; -use util::{Config, Sha256}; -use util::{FileLock, Filesystem}; +use crate::util::errors::{CargoResult, CargoResultExt}; +use crate::util::{Config, Sha256}; +use crate::util::{FileLock, Filesystem}; pub struct RemoteRegistry<'cfg> { index_path: Filesystem, diff --git a/src/cargo/sources/replaced.rs b/src/cargo/sources/replaced.rs index 128a8529d..34ea1797a 100644 --- a/src/cargo/sources/replaced.rs +++ b/src/cargo/sources/replaced.rs @@ -1,6 +1,6 @@ -use core::source::MaybePackage; -use core::{Dependency, Package, PackageId, Source, SourceId, Summary}; -use util::errors::{CargoResult, CargoResultExt}; +use crate::core::source::MaybePackage; +use crate::core::{Dependency, Package, PackageId, Source, SourceId, Summary}; +use crate::util::errors::{CargoResult, CargoResultExt}; pub struct ReplacedSource<'cfg> { to_replace: SourceId, diff --git a/src/cargo/util/cfg.rs b/src/cargo/util/cfg.rs index 877452c8f..4f77a694d 100644 --- a/src/cargo/util/cfg.rs +++ b/src/cargo/util/cfg.rs @@ -2,7 +2,7 @@ use std::str::{self, FromStr}; use std::iter; use std::fmt; -use util::{CargoError, CargoResult}; +use crate::util::{CargoError, CargoResult}; #[derive(Eq, PartialEq, Hash, Ord, PartialOrd, Clone, Debug)] pub enum Cfg { @@ -138,9 +138,9 @@ impl<'a> Parser<'a> { self.t.next(); let mut e = Vec::new(); self.eat(&Token::LeftParen)?; - while !self.try(&Token::RightParen) { + while !self.r#try(&Token::RightParen) { e.push(self.expr()?); - if !self.try(&Token::Comma) { + if !self.r#try(&Token::Comma) { self.eat(&Token::RightParen)?; break; } @@ -170,7 +170,7 @@ impl<'a> Parser<'a> { fn cfg(&mut self) -> CargoResult { match self.t.next() { Some(Ok(Token::Ident(name))) => { - let e = if self.try(&Token::Equals) { + let e = if self.r#try(&Token::Equals) { let val = match self.t.next() { Some(Ok(Token::String(s))) => s, Some(Ok(t)) => bail!("expected a string, found {}", t.classify()), @@ -189,7 +189,7 @@ impl<'a> Parser<'a> { } } - fn try(&mut self, token: &Token<'a>) -> bool { + fn r#try(&mut self, token: &Token<'a>) -> bool { match self.t.peek() { Some(&Ok(ref t)) if token == t => {} _ => return false, diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs index 774e0fce6..533c6f9a4 100644 --- a/src/cargo/util/command_prelude.rs +++ b/src/cargo/util/command_prelude.rs @@ -2,17 +2,17 @@ use std::path::PathBuf; use std::fs; use clap::{self, SubCommand}; -use CargoResult; -use core::Workspace; -use core::compiler::{BuildConfig, MessageFormat}; -use ops::{CompileFilter, CompileOptions, NewOptions, Packages, VersionControl}; -use sources::CRATES_IO_REGISTRY; -use util::paths; -use util::important_paths::find_root_manifest_for_wd; +use crate::CargoResult; +use crate::core::Workspace; +use crate::core::compiler::{BuildConfig, MessageFormat}; +use crate::ops::{CompileFilter, CompileOptions, NewOptions, Packages, VersionControl}; +use crate::sources::CRATES_IO_REGISTRY; +use crate::util::paths; +use crate::util::important_paths::find_root_manifest_for_wd; pub use clap::{AppSettings, Arg, ArgMatches}; -pub use {CliError, CliResult, Config}; -pub use core::compiler::CompileMode; +pub use crate::{CliError, CliResult, Config}; +pub use crate::core::compiler::CompileMode; pub type App = clap::App<'static, 'static>; diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs index 8a13f7281..16028523b 100644 --- a/src/cargo/util/config.rs +++ b/src/cargo/util/config.rs @@ -22,17 +22,17 @@ use lazycell::LazyCell; use serde::{de, de::IntoDeserializer}; use toml; -use core::profiles::ConfigProfiles; -use core::shell::Verbosity; -use core::{CliUnstable, Shell, SourceId, Workspace}; -use ops; +use crate::core::profiles::ConfigProfiles; +use crate::core::shell::Verbosity; +use crate::core::{CliUnstable, Shell, SourceId, Workspace}; +use crate::ops; use url::Url; -use util::errors::{internal, CargoResult, CargoResultExt}; -use util::paths; -use util::toml as cargo_toml; -use util::Filesystem; -use util::Rustc; -use util::ToUrl; +use crate::util::errors::{internal, CargoResult, CargoResultExt}; +use crate::util::paths; +use crate::util::toml as cargo_toml; +use crate::util::Filesystem; +use crate::util::Rustc; +use crate::util::ToUrl; use self::ConfigValue as CV; diff --git a/src/cargo/util/diagnostic_server.rs b/src/cargo/util/diagnostic_server.rs index e7138f1b7..11553a9da 100644 --- a/src/cargo/util/diagnostic_server.rs +++ b/src/cargo/util/diagnostic_server.rs @@ -12,8 +12,8 @@ use std::thread::{self, JoinHandle}; use failure::{Error, ResultExt}; use serde_json; -use util::{Config, ProcessBuilder}; -use util::errors::CargoResult; +use crate::util::{Config, ProcessBuilder}; +use crate::util::errors::CargoResult; const DIAGNOSICS_SERVER_VAR: &str = "__CARGO_FIX_DIAGNOSTICS_SERVER"; const PLEASE_REPORT_THIS_BUG: &str = diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs index 6fc28981d..d508c27b3 100644 --- a/src/cargo/util/errors.rs +++ b/src/cargo/util/errors.rs @@ -5,7 +5,7 @@ use std::process::{ExitStatus, Output}; use std::str; use std::path::PathBuf; -use core::{TargetKind, Workspace}; +use crate::core::{TargetKind, Workspace}; use failure::{Context, Error, Fail}; use clap; diff --git a/src/cargo/util/flock.rs b/src/cargo/util/flock.rs index c2929756a..2133e3212 100644 --- a/src/cargo/util/flock.rs +++ b/src/cargo/util/flock.rs @@ -8,9 +8,9 @@ use fs2::{lock_contended_error, FileExt}; #[allow(unused_imports)] use libc; -use util::Config; -use util::paths; -use util::errors::{CargoError, CargoResult, CargoResultExt}; +use crate::util::Config; +use crate::util::paths; +use crate::util::errors::{CargoError, CargoResult, CargoResultExt}; pub struct FileLock { f: Option, @@ -270,7 +270,7 @@ fn acquire( config: &Config, msg: &str, path: &Path, - try: &Fn() -> io::Result<()>, + r#try: &Fn() -> io::Result<()>, block: &Fn() -> io::Result<()>, ) -> CargoResult<()> { // File locking on Unix is currently implemented via `flock`, which is known @@ -287,7 +287,7 @@ fn acquire( return Ok(()); } - match try() { + match r#try() { Ok(()) => return Ok(()), // In addition to ignoring NFS which is commonly not working we also diff --git a/src/cargo/util/important_paths.rs b/src/cargo/util/important_paths.rs index 2fb4dea59..b09d7ef27 100644 --- a/src/cargo/util/important_paths.rs +++ b/src/cargo/util/important_paths.rs @@ -1,7 +1,7 @@ use std::fs; use std::path::{Path, PathBuf}; -use util::errors::CargoResult; -use util::paths; +use crate::util::errors::CargoResult; +use crate::util::paths; /// Find the root Cargo.toml pub fn find_root_manifest_for_wd(cwd: &Path) -> CargoResult { diff --git a/src/cargo/util/machine_message.rs b/src/cargo/util/machine_message.rs index a41ce918f..421c8f149 100644 --- a/src/cargo/util/machine_message.rs +++ b/src/cargo/util/machine_message.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use serde::ser; use serde_json::{self, value::RawValue}; -use core::{PackageId, Target}; +use crate::core::{PackageId, Target}; pub trait Message: ser::Serialize { fn reason(&self) -> &str; diff --git a/src/cargo/util/network.rs b/src/cargo/util/network.rs index 4c3fcace3..c11dfd554 100644 --- a/src/cargo/util/network.rs +++ b/src/cargo/util/network.rs @@ -3,8 +3,8 @@ use git2; use failure::Error; -use util::Config; -use util::errors::{CargoResult, HttpNot200}; +use crate::util::Config; +use crate::util::errors::{CargoResult, HttpNot200}; pub struct Retry<'a> { config: &'a Config, @@ -19,7 +19,7 @@ impl<'a> Retry<'a> { }) } - pub fn try(&mut self, f: impl FnOnce() -> CargoResult) + pub fn r#try(&mut self, f: impl FnOnce() -> CargoResult) -> CargoResult> { match f() { @@ -84,7 +84,7 @@ where { let mut retry = Retry::new(config)?; loop { - if let Some(ret) = retry.try(&mut callback)? { + if let Some(ret) = retry.r#try(&mut callback)? { return Ok(ret) } } @@ -108,7 +108,7 @@ fn with_retry_repeats_the_call_then_works() { #[test] fn with_retry_finds_nested_spurious_errors() { - use util::CargoError; + use crate::util::CargoError; //Error HTTP codes (5xx) are considered maybe_spurious and will prompt retry //String error messages are not considered spurious diff --git a/src/cargo/util/paths.rs b/src/cargo/util/paths.rs index ca54e5fd6..363245f42 100644 --- a/src/cargo/util/paths.rs +++ b/src/cargo/util/paths.rs @@ -8,7 +8,7 @@ use std::path::{Component, Path, PathBuf}; use filetime::FileTime; -use util::errors::{CargoError, CargoResult, CargoResultExt, Internal}; +use crate::util::errors::{CargoError, CargoResult, CargoResultExt, Internal}; pub fn join_paths>(paths: &[T], env: &str) -> CargoResult { let err = match env::join_paths(paths.iter()) { diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs index ca44042c3..a2f56e7f8 100644 --- a/src/cargo/util/process_builder.rs +++ b/src/cargo/util/process_builder.rs @@ -9,7 +9,7 @@ use failure::Fail; use jobserver::Client; use shell_escape::escape; -use util::{process_error, CargoResult, CargoResultExt, read2}; +use crate::util::{process_error, CargoResult, CargoResultExt, read2}; /// A builder object for an external process, similar to `std::process::Command`. #[derive(Clone, Debug)] @@ -332,14 +332,14 @@ pub fn process>(cmd: T) -> ProcessBuilder { #[cfg(unix)] mod imp { - use CargoResult; + use crate::CargoResult; use std::os::unix::process::CommandExt; - use util::{process_error, ProcessBuilder}; + use crate::util::{process_error, ProcessBuilder}; pub fn exec_replace(process_builder: &ProcessBuilder) -> CargoResult<()> { let mut command = process_builder.build_command(); let error = command.exec(); - Err(::util::CargoError::from(error) + Err(crate::util::CargoError::from(error) .context(process_error( &format!("could not execute process {}", process_builder), None, diff --git a/src/cargo/util/progress.rs b/src/cargo/util/progress.rs index fe90d3119..21429a3aa 100644 --- a/src/cargo/util/progress.rs +++ b/src/cargo/util/progress.rs @@ -2,8 +2,8 @@ use std::cmp; use std::env; use std::time::{Duration, Instant}; -use core::shell::Verbosity; -use util::{CargoResult, Config}; +use crate::core::shell::Verbosity; +use crate::util::{CargoResult, Config}; use unicode_width::UnicodeWidthChar; diff --git a/src/cargo/util/rustc.rs b/src/cargo/util/rustc.rs index 0852d6307..be63780a9 100644 --- a/src/cargo/util/rustc.rs +++ b/src/cargo/util/rustc.rs @@ -9,8 +9,8 @@ use std::env; use serde_json; -use util::{self, internal, profile, CargoResult, ProcessBuilder}; -use util::paths; +use crate::util::{self, internal, profile, CargoResult, ProcessBuilder}; +use crate::util::paths; /// Information on the `rustc` executable #[derive(Debug)] diff --git a/src/cargo/util/to_semver.rs b/src/cargo/util/to_semver.rs index 4ffd6e3c0..b3b2f64f5 100644 --- a/src/cargo/util/to_semver.rs +++ b/src/cargo/util/to_semver.rs @@ -1,5 +1,5 @@ use semver::Version; -use util::errors::CargoResult; +use crate::util::errors::CargoResult; pub trait ToSemver { fn to_semver(self) -> CargoResult; diff --git a/src/cargo/util/to_url.rs b/src/cargo/util/to_url.rs index 664c2568d..c23ff3908 100644 --- a/src/cargo/util/to_url.rs +++ b/src/cargo/util/to_url.rs @@ -2,7 +2,7 @@ use std::path::Path; use url::Url; -use util::CargoResult; +use crate::util::CargoResult; /// A type that can be converted to a Url pub trait ToUrl { diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index e14fdd4f2..39595c857 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -12,16 +12,16 @@ use serde_ignored; use toml; use url::Url; -use core::dependency::{Kind, Platform}; -use core::manifest::{LibKind, ManifestMetadata, TargetSourcePath, Warnings}; -use core::profiles::Profiles; -use core::{Dependency, Manifest, PackageId, Summary, Target}; -use core::{Edition, EitherManifest, Feature, Features, VirtualManifest}; -use core::{GitReference, PackageIdSpec, SourceId, WorkspaceConfig, WorkspaceRootConfig}; -use sources::{CRATES_IO_INDEX, CRATES_IO_REGISTRY}; -use util::errors::{CargoError, CargoResult, CargoResultExt, ManifestError}; -use util::paths; -use util::{self, Config, ToUrl}; +use crate::core::dependency::{Kind, Platform}; +use crate::core::manifest::{LibKind, ManifestMetadata, TargetSourcePath, Warnings}; +use crate::core::profiles::Profiles; +use crate::core::{Dependency, Manifest, PackageId, Summary, Target}; +use crate::core::{Edition, EitherManifest, Feature, Features, VirtualManifest}; +use crate::core::{GitReference, PackageIdSpec, SourceId, WorkspaceConfig, WorkspaceRootConfig}; +use crate::sources::{CRATES_IO_INDEX, CRATES_IO_REGISTRY}; +use crate::util::errors::{CargoError, CargoResult, CargoResultExt, ManifestError}; +use crate::util::paths; +use crate::util::{self, Config, ToUrl}; mod targets; use self::targets::targets; diff --git a/src/cargo/util/toml/targets.rs b/src/cargo/util/toml/targets.rs index 69b0f85db..85ce8d051 100644 --- a/src/cargo/util/toml/targets.rs +++ b/src/cargo/util/toml/targets.rs @@ -18,8 +18,8 @@ use super::{ LibKind, PathValue, StringOrBool, StringOrVec, TomlBenchTarget, TomlBinTarget, TomlExampleTarget, TomlLibTarget, TomlManifest, TomlTarget, TomlTestTarget, }; -use core::{compiler, Edition, Feature, Features, Target}; -use util::errors::{CargoResult, CargoResultExt}; +use crate::core::{compiler, Edition, Feature, Features, Target}; +use crate::util::errors::{CargoResult, CargoResultExt}; pub fn targets( features: &Features, diff --git a/src/cargo/util/vcs.rs b/src/cargo/util/vcs.rs index a5c047d79..30fbf793b 100644 --- a/src/cargo/util/vcs.rs +++ b/src/cargo/util/vcs.rs @@ -3,7 +3,7 @@ use std::fs::create_dir; use git2; -use util::{process, CargoResult}; +use crate::util::{process, CargoResult}; // Check if we are in an existing repo. We define that to be true if either: // diff --git a/src/crates-io/Cargo.toml b/src/crates-io/Cargo.toml index dc47dedab..a25c2fe55 100644 --- a/src/crates-io/Cargo.toml +++ b/src/crates-io/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "crates-io" version = "0.21.0" +edition = "2018" authors = ["Alex Crichton "] license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/cargo" diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs index 0893e52cf..975ba0132 100644 --- a/tests/testsuite/alt_registry.rs +++ b/tests/testsuite/alt_registry.rs @@ -1,7 +1,7 @@ use std::fs::File; use std::io::Write; -use support::registry::{self, alt_api_path, Package}; -use support::{basic_manifest, paths, project}; +use crate::support::registry::{self, alt_api_path, Package}; +use crate::support::{basic_manifest, paths, project}; #[test] fn is_feature_gated() { diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs index 8036d32d7..502cbe1b5 100644 --- a/tests/testsuite/bad_config.rs +++ b/tests/testsuite/bad_config.rs @@ -1,5 +1,5 @@ -use support::registry::Package; -use support::{basic_manifest, project}; +use crate::support::registry::Package; +use crate::support::{basic_manifest, project}; #[test] fn bad1() { diff --git a/tests/testsuite/bad_manifest_path.rs b/tests/testsuite/bad_manifest_path.rs index 41ba86ba8..242d29763 100644 --- a/tests/testsuite/bad_manifest_path.rs +++ b/tests/testsuite/bad_manifest_path.rs @@ -1,4 +1,4 @@ -use support::{basic_bin_manifest, main_file, project}; +use crate::support::{basic_bin_manifest, main_file, project}; fn assert_not_a_cargo_toml(command: &str, manifest_path_argument: &str) { let p = project() diff --git a/tests/testsuite/bench.rs b/tests/testsuite/bench.rs index c91298167..bb1f9a150 100644 --- a/tests/testsuite/bench.rs +++ b/tests/testsuite/bench.rs @@ -1,6 +1,6 @@ -use support::is_nightly; -use support::paths::CargoPathExt; -use support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project}; +use crate::support::is_nightly; +use crate::support::paths::CargoPathExt; +use crate::support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project}; #[test] fn cargo_bench_simple() { diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 3bf70548d..9d65e8e56 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -3,13 +3,13 @@ use std::fs::{self, File}; use std::io::prelude::*; use cargo::util::paths::dylib_path_envvar; -use support::paths::{root, CargoPathExt}; -use support::registry::Package; -use support::ProjectBuilder; -use support::{ +use crate::support::paths::{root, CargoPathExt}; +use crate::support::registry::Package; +use crate::support::ProjectBuilder; +use crate::support::{ basic_bin_manifest, basic_lib_manifest, basic_manifest, is_nightly, rustc_host, sleep_ms, }; -use support::{main_file, project, Execs}; +use crate::support::{main_file, project, Execs}; #[test] fn cargo_compile_simple() { diff --git a/tests/testsuite/build_auth.rs b/tests/testsuite/build_auth.rs index 394df2813..ace79b445 100644 --- a/tests/testsuite/build_auth.rs +++ b/tests/testsuite/build_auth.rs @@ -6,8 +6,8 @@ use std::thread; use bufstream::BufStream; use git2; -use support::paths; -use support::{basic_manifest, project}; +use crate::support::paths; +use crate::support::{basic_manifest, project}; // Test that HTTP auth is offered from `credential.helper` #[test] diff --git a/tests/testsuite/build_lib.rs b/tests/testsuite/build_lib.rs index 9b8de8383..bb714a8a7 100644 --- a/tests/testsuite/build_lib.rs +++ b/tests/testsuite/build_lib.rs @@ -1,4 +1,4 @@ -use support::{basic_bin_manifest, basic_manifest, project}; +use crate::support::{basic_bin_manifest, basic_manifest, project}; #[test] fn build_lib_only() { diff --git a/tests/testsuite/build_plan.rs b/tests/testsuite/build_plan.rs index 7b520cfd6..cb019ae39 100644 --- a/tests/testsuite/build_plan.rs +++ b/tests/testsuite/build_plan.rs @@ -1,5 +1,5 @@ -use support::registry::Package; -use support::{basic_bin_manifest, basic_manifest, main_file, project}; +use crate::support::registry::Package; +use crate::support::{basic_bin_manifest, basic_manifest, main_file, project}; #[test] fn cargo_build_plan_simple() { diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index b04707df7..5e3d524e1 100644 --- a/tests/testsuite/build_script.rs +++ b/tests/testsuite/build_script.rs @@ -6,10 +6,10 @@ use std::thread; use std::time::Duration; use cargo::util::paths::remove_dir_all; -use support::paths::CargoPathExt; -use support::registry::Package; -use support::{basic_manifest, cross_compile, project}; -use support::{rustc_host, sleep_ms}; +use crate::support::paths::CargoPathExt; +use crate::support::registry::Package; +use crate::support::{basic_manifest, cross_compile, project}; +use crate::support::{rustc_host, sleep_ms}; #[test] fn custom_build_script_failed() { diff --git a/tests/testsuite/build_script_env.rs b/tests/testsuite/build_script_env.rs index 2a7be1aa5..ca4caf211 100644 --- a/tests/testsuite/build_script_env.rs +++ b/tests/testsuite/build_script_env.rs @@ -1,7 +1,7 @@ use std::fs::File; -use support::project; -use support::sleep_ms; +use crate::support::project; +use crate::support::sleep_ms; #[test] fn rerun_if_env_changes() { diff --git a/tests/testsuite/cargo_alias_config.rs b/tests/testsuite/cargo_alias_config.rs index 8867c8cda..a2b98fe20 100644 --- a/tests/testsuite/cargo_alias_config.rs +++ b/tests/testsuite/cargo_alias_config.rs @@ -1,4 +1,4 @@ -use support::{basic_bin_manifest, project}; +use crate::support::{basic_bin_manifest, project}; #[test] fn alias_incorrect_config_type() { diff --git a/tests/testsuite/cargo_command.rs b/tests/testsuite/cargo_command.rs index 793ed5029..b3963f22f 100644 --- a/tests/testsuite/cargo_command.rs +++ b/tests/testsuite/cargo_command.rs @@ -5,10 +5,10 @@ use std::path::{Path, PathBuf}; use std::str; use cargo; -use support::cargo_process; -use support::paths::{self, CargoPathExt}; -use support::registry::Package; -use support::{basic_bin_manifest, basic_manifest, cargo_exe, project, Project}; +use crate::support::cargo_process; +use crate::support::paths::{self, CargoPathExt}; +use crate::support::registry::Package; +use crate::support::{basic_bin_manifest, basic_manifest, cargo_exe, project, Project}; #[cfg_attr(windows, allow(dead_code))] enum FakeKind<'a> { diff --git a/tests/testsuite/cargo_features.rs b/tests/testsuite/cargo_features.rs index de067c208..b38b0c3a5 100644 --- a/tests/testsuite/cargo_features.rs +++ b/tests/testsuite/cargo_features.rs @@ -1,4 +1,4 @@ -use support::{project, publish}; +use crate::support::{project, publish}; #[test] fn feature_required() { diff --git a/tests/testsuite/cfg.rs b/tests/testsuite/cfg.rs index c332438ef..241e6aba2 100644 --- a/tests/testsuite/cfg.rs +++ b/tests/testsuite/cfg.rs @@ -2,9 +2,9 @@ use std::fmt; use std::str::FromStr; use cargo::util::{Cfg, CfgExpr}; -use support::registry::Package; -use support::rustc_host; -use support::{basic_manifest, project}; +use crate::support::registry::Package; +use crate::support::rustc_host; +use crate::support::{basic_manifest, project}; macro_rules! c { ($a:ident) => { diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs index f743991b2..c2bc85613 100644 --- a/tests/testsuite/check.rs +++ b/tests/testsuite/check.rs @@ -1,10 +1,10 @@ use std::fmt::{self, Write}; use glob::glob; -use support::install::exe; -use support::paths::CargoPathExt; -use support::registry::Package; -use support::{basic_manifest, project}; +use crate::support::install::exe; +use crate::support::paths::CargoPathExt; +use crate::support::registry::Package; +use crate::support::{basic_manifest, project}; #[test] fn check_success() { diff --git a/tests/testsuite/clean.rs b/tests/testsuite/clean.rs index dc2ac57c4..7943a6f0f 100644 --- a/tests/testsuite/clean.rs +++ b/tests/testsuite/clean.rs @@ -1,7 +1,7 @@ use std::env; -use support::registry::Package; -use support::{basic_bin_manifest, basic_manifest, git, main_file, project}; +use crate::support::registry::Package; +use crate::support::{basic_bin_manifest, basic_manifest, git, main_file, project}; #[test] fn cargo_clean_simple() { diff --git a/tests/testsuite/collisions.rs b/tests/testsuite/collisions.rs index 6fc4406ae..dac33312e 100644 --- a/tests/testsuite/collisions.rs +++ b/tests/testsuite/collisions.rs @@ -1,5 +1,5 @@ use std::env; -use support::{basic_manifest, project}; +use crate::support::{basic_manifest, project}; #[test] fn collision_dylib() { diff --git a/tests/testsuite/concurrent.rs b/tests/testsuite/concurrent.rs index a999467f9..e2b43073a 100644 --- a/tests/testsuite/concurrent.rs +++ b/tests/testsuite/concurrent.rs @@ -8,11 +8,11 @@ use std::time::Duration; use std::{env, str}; use git2; -use support::cargo_process; -use support::git; -use support::install::{cargo_home, assert_has_installed_exe}; -use support::registry::Package; -use support::{basic_manifest, execs, project}; +use crate::support::cargo_process; +use crate::support::git; +use crate::support::install::{cargo_home, assert_has_installed_exe}; +use crate::support::registry::Package; +use crate::support::{basic_manifest, execs, project}; fn pkg(name: &str, vers: &str) { Package::new(name, vers) diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs index 681cc46e9..794ca8da9 100644 --- a/tests/testsuite/config.rs +++ b/tests/testsuite/config.rs @@ -5,7 +5,7 @@ use cargo::CargoError; use std::borrow::Borrow; use std::collections; use std::fs; -use support::{lines_match, paths, project}; +use crate::support::{lines_match, paths, project}; #[test] fn read_env_vars_for_config() { diff --git a/tests/testsuite/corrupt_git.rs b/tests/testsuite/corrupt_git.rs index 3e4e5ee4b..a991f5794 100644 --- a/tests/testsuite/corrupt_git.rs +++ b/tests/testsuite/corrupt_git.rs @@ -2,8 +2,8 @@ use std::fs; use std::path::{Path, PathBuf}; use cargo::util::paths as cargopaths; -use support::paths; -use support::{basic_manifest, git, project}; +use crate::support::paths; +use crate::support::{basic_manifest, git, project}; #[test] fn deleting_database_files() { diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs index 36c750aaf..941c6d935 100644 --- a/tests/testsuite/cross_compile.rs +++ b/tests/testsuite/cross_compile.rs @@ -1,5 +1,5 @@ -use support::{basic_bin_manifest, basic_manifest, cross_compile, project}; -use support::{is_nightly, rustc_host}; +use crate::support::{basic_bin_manifest, basic_manifest, cross_compile, project}; +use crate::support::{is_nightly, rustc_host}; #[test] fn simple_cross() { diff --git a/tests/testsuite/cross_publish.rs b/tests/testsuite/cross_publish.rs index 389410bae..ffb3a0507 100644 --- a/tests/testsuite/cross_publish.rs +++ b/tests/testsuite/cross_publish.rs @@ -3,7 +3,7 @@ use std::io::prelude::*; use std::path::PathBuf; use flate2::read::GzDecoder; -use support::{cross_compile, project, publish}; +use crate::support::{cross_compile, project, publish}; use tar::Archive; #[test] diff --git a/tests/testsuite/custom_target.rs b/tests/testsuite/custom_target.rs index 11c31ca1b..14f4b1ae7 100644 --- a/tests/testsuite/custom_target.rs +++ b/tests/testsuite/custom_target.rs @@ -1,5 +1,5 @@ -use support::is_nightly; -use support::{basic_manifest, project}; +use crate::support::is_nightly; +use crate::support::{basic_manifest, project}; #[test] fn custom_target_minimal() { diff --git a/tests/testsuite/death.rs b/tests/testsuite/death.rs index ecda4f6f5..6c26e5f02 100644 --- a/tests/testsuite/death.rs +++ b/tests/testsuite/death.rs @@ -5,7 +5,7 @@ use std::process::{Child, Stdio}; use std::thread; use std::time::Duration; -use support::project; +use crate::support::project; #[cfg(unix)] fn enabled() -> bool { diff --git a/tests/testsuite/dep_info.rs b/tests/testsuite/dep_info.rs index 4fdb22096..f273bc41e 100644 --- a/tests/testsuite/dep_info.rs +++ b/tests/testsuite/dep_info.rs @@ -1,5 +1,5 @@ use filetime::FileTime; -use support::{basic_bin_manifest, main_file, project}; +use crate::support::{basic_bin_manifest, main_file, project}; #[test] fn build_dep_info() { diff --git a/tests/testsuite/directory.rs b/tests/testsuite/directory.rs index a2ce591a5..1bd2a2650 100644 --- a/tests/testsuite/directory.rs +++ b/tests/testsuite/directory.rs @@ -4,11 +4,11 @@ use std::fs::{self, File}; use std::io::prelude::*; use std::str; -use support::cargo_process; -use support::git; -use support::paths; -use support::registry::{cksum, Package}; -use support::{basic_manifest, project, ProjectBuilder}; +use crate::support::cargo_process; +use crate::support::git; +use crate::support::paths; +use crate::support::registry::{cksum, Package}; +use crate::support::{basic_manifest, project, ProjectBuilder}; fn setup() { let root = paths::root(); diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs index 2f2f073f9..c9a1f3ae2 100644 --- a/tests/testsuite/doc.rs +++ b/tests/testsuite/doc.rs @@ -1,13 +1,13 @@ use std::fs::{self, File}; use std::io::Read; use std::str; -use support; +use crate::support; use glob::glob; -use support::paths::CargoPathExt; -use support::registry::Package; -use support::{basic_lib_manifest, basic_manifest, git, project}; -use support::{is_nightly, rustc_host}; +use crate::support::paths::CargoPathExt; +use crate::support::registry::Package; +use crate::support::{basic_lib_manifest, basic_manifest, git, project}; +use crate::support::{is_nightly, rustc_host}; #[test] fn simple() { diff --git a/tests/testsuite/edition.rs b/tests/testsuite/edition.rs index 8b35c6ccf..ae9c2653e 100644 --- a/tests/testsuite/edition.rs +++ b/tests/testsuite/edition.rs @@ -1,4 +1,4 @@ -use support::{basic_lib_manifest, is_nightly, project}; +use crate::support::{basic_lib_manifest, is_nightly, project}; #[test] fn edition_works_for_build_script() { diff --git a/tests/testsuite/features.rs b/tests/testsuite/features.rs index daf68a605..07fbd4ac1 100644 --- a/tests/testsuite/features.rs +++ b/tests/testsuite/features.rs @@ -1,9 +1,9 @@ use std::fs::File; use std::io::prelude::*; -use support::paths::CargoPathExt; -use support::registry::Package; -use support::{basic_manifest, project}; +use crate::support::paths::CargoPathExt; +use crate::support::registry::Package; +use crate::support::{basic_manifest, project}; #[test] fn invalid1() { diff --git a/tests/testsuite/fetch.rs b/tests/testsuite/fetch.rs index a76a4c52b..b453b95d2 100644 --- a/tests/testsuite/fetch.rs +++ b/tests/testsuite/fetch.rs @@ -1,6 +1,6 @@ -use support::registry::Package; -use support::rustc_host; -use support::{basic_manifest, cross_compile, project}; +use crate::support::registry::Package; +use crate::support::rustc_host; +use crate::support::{basic_manifest, cross_compile, project}; #[test] fn no_deps() { diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs index dedbec5c6..280d02724 100644 --- a/tests/testsuite/fix.rs +++ b/tests/testsuite/fix.rs @@ -2,9 +2,9 @@ use std::fs::File; use git2; -use support::git; -use support::is_nightly; -use support::{basic_manifest, project}; +use crate::support::git; +use crate::support::is_nightly; +use crate::support::{basic_manifest, project}; use std::io::Write; diff --git a/tests/testsuite/freshness.rs b/tests/testsuite/freshness.rs index 00c50e690..7b959d444 100644 --- a/tests/testsuite/freshness.rs +++ b/tests/testsuite/freshness.rs @@ -1,10 +1,10 @@ use std::fs::{self, File}; use std::io::prelude::*; -use support::paths::CargoPathExt; -use support::registry::Package; -use support::sleep_ms; -use support::{basic_manifest, project}; +use crate::support::paths::CargoPathExt; +use crate::support::registry::Package; +use crate::support::sleep_ms; +use crate::support::{basic_manifest, project}; #[test] fn modifying_and_moving() { diff --git a/tests/testsuite/generate_lockfile.rs b/tests/testsuite/generate_lockfile.rs index 5d00d4744..cfe0253e6 100644 --- a/tests/testsuite/generate_lockfile.rs +++ b/tests/testsuite/generate_lockfile.rs @@ -1,8 +1,8 @@ use std::fs::{self, File}; use std::io::prelude::*; -use support::registry::Package; -use support::{basic_manifest, paths, project, ProjectBuilder}; +use crate::support::registry::Package; +use crate::support::{basic_manifest, paths, project, ProjectBuilder}; #[test] fn adding_and_removing_packages() { diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index 027f5ec77..38cc48469 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -8,10 +8,10 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use std::thread; -use support::paths::{self, CargoPathExt}; -use support::sleep_ms; -use support::{basic_lib_manifest, basic_manifest, git, main_file, path2url, project}; -use support::Project; +use crate::support::paths::{self, CargoPathExt}; +use crate::support::sleep_ms; +use crate::support::{basic_lib_manifest, basic_manifest, git, main_file, path2url, project}; +use crate::support::Project; #[test] fn cargo_compile_simple_git_dep() { diff --git a/tests/testsuite/init.rs b/tests/testsuite/init.rs index 3dcf65535..f9c36cbd1 100644 --- a/tests/testsuite/init.rs +++ b/tests/testsuite/init.rs @@ -1,9 +1,9 @@ use std::env; use std::fs::{self, File}; use std::io::prelude::*; -use support; +use crate::support; -use support::{paths, Execs}; +use crate::support::{paths, Execs}; fn cargo_process(s: &str) -> Execs { let mut execs = support::cargo_process(s); diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index c11adbfc0..4a697c6d8 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -1,14 +1,14 @@ use std::fs::{self, File, OpenOptions}; use std::io::prelude::*; -use support; +use crate::support; use git2; -use support::cross_compile; -use support::git; -use support::install::{assert_has_installed_exe, assert_has_not_installed_exe, cargo_home}; -use support::paths; -use support::registry::Package; -use support::{basic_manifest, cargo_process, project}; +use crate::support::cross_compile; +use crate::support::git; +use crate::support::install::{assert_has_installed_exe, assert_has_not_installed_exe, cargo_home}; +use crate::support::paths; +use crate::support::registry::Package; +use crate::support::{basic_manifest, cargo_process, project}; fn pkg(name: &str, vers: &str) { Package::new(name, vers) diff --git a/tests/testsuite/jobserver.rs b/tests/testsuite/jobserver.rs index d2d033307..b436ce813 100644 --- a/tests/testsuite/jobserver.rs +++ b/tests/testsuite/jobserver.rs @@ -2,7 +2,7 @@ use std::net::TcpListener; use std::process::Command; use std::thread; -use support::{cargo_exe, project}; +use crate::support::{cargo_exe, project}; #[test] fn jobserver_exists() { diff --git a/tests/testsuite/local_registry.rs b/tests/testsuite/local_registry.rs index 08076b711..b87619065 100644 --- a/tests/testsuite/local_registry.rs +++ b/tests/testsuite/local_registry.rs @@ -1,9 +1,9 @@ use std::fs::{self, File}; use std::io::prelude::*; -use support::paths::{self, CargoPathExt}; -use support::registry::Package; -use support::{basic_manifest, project}; +use crate::support::paths::{self, CargoPathExt}; +use crate::support::registry::Package; +use crate::support::{basic_manifest, project}; fn setup() { let root = paths::root(); diff --git a/tests/testsuite/lockfile_compat.rs b/tests/testsuite/lockfile_compat.rs index a4adcdc83..4a1f03438 100644 --- a/tests/testsuite/lockfile_compat.rs +++ b/tests/testsuite/lockfile_compat.rs @@ -1,6 +1,6 @@ -use support::git; -use support::registry::Package; -use support::{basic_manifest, lines_match, project}; +use crate::support::git; +use crate::support::registry::Package; +use crate::support::{basic_manifest, lines_match, project}; #[test] fn oldest_lockfile_still_works() { diff --git a/tests/testsuite/login.rs b/tests/testsuite/login.rs index 6fc84d791..e9d20a4fa 100644 --- a/tests/testsuite/login.rs +++ b/tests/testsuite/login.rs @@ -3,9 +3,9 @@ use std::io::prelude::*; use cargo::core::Shell; use cargo::util::config::Config; -use support::cargo_process; -use support::install::cargo_home; -use support::registry::registry; +use crate::support::cargo_process; +use crate::support::install::cargo_home; +use crate::support::registry::registry; use toml; const TOKEN: &str = "test-token"; diff --git a/tests/testsuite/member_errors.rs b/tests/testsuite/member_errors.rs index 17d8da56d..d7b63db1d 100644 --- a/tests/testsuite/member_errors.rs +++ b/tests/testsuite/member_errors.rs @@ -3,7 +3,7 @@ use cargo::core::{compiler::CompileMode, Workspace}; use cargo::ops::{self, CompileOptions}; use cargo::util::{config::Config, errors::ManifestError}; -use support::project; +use crate::support::project; /// Tests inclusion of a `ManifestError` pointing to a member manifest /// when that manifest fails to deserialize. diff --git a/tests/testsuite/metabuild.rs b/tests/testsuite/metabuild.rs index 7837042b1..5a183f5b4 100644 --- a/tests/testsuite/metabuild.rs +++ b/tests/testsuite/metabuild.rs @@ -1,7 +1,7 @@ use glob::glob; use serde_json; use std::str; -use support::{ +use crate::support::{ basic_lib_manifest, basic_manifest, is_coarse_mtime, project, registry::Package, rustc_host, Project, }; diff --git a/tests/testsuite/metadata.rs b/tests/testsuite/metadata.rs index 7abddf778..e624b1f19 100644 --- a/tests/testsuite/metadata.rs +++ b/tests/testsuite/metadata.rs @@ -1,5 +1,5 @@ -use support::registry::Package; -use support::{basic_bin_manifest, basic_lib_manifest, main_file, project}; +use crate::support::registry::Package; +use crate::support::{basic_bin_manifest, basic_lib_manifest, main_file, project}; #[test] fn cargo_metadata_simple() { diff --git a/tests/testsuite/net_config.rs b/tests/testsuite/net_config.rs index afcf7c508..b8a033247 100644 --- a/tests/testsuite/net_config.rs +++ b/tests/testsuite/net_config.rs @@ -1,4 +1,4 @@ -use support::project; +use crate::support::project; #[test] fn net_retry_loads_from_config() { diff --git a/tests/testsuite/new.rs b/tests/testsuite/new.rs index 52e327e36..1781332a9 100644 --- a/tests/testsuite/new.rs +++ b/tests/testsuite/new.rs @@ -2,8 +2,8 @@ use std::env; use std::fs::{self, File}; use std::io::prelude::*; -use support::paths; -use support::{cargo_process, git_process}; +use crate::support::paths; +use crate::support::{cargo_process, git_process}; fn create_empty_gitconfig() { // This helps on Windows where libgit2 is very aggressive in attempting to diff --git a/tests/testsuite/out_dir.rs b/tests/testsuite/out_dir.rs index 04a224052..c06e86dd5 100644 --- a/tests/testsuite/out_dir.rs +++ b/tests/testsuite/out_dir.rs @@ -2,8 +2,8 @@ use std::env; use std::fs::{self, File}; use std::path::Path; -use support::sleep_ms; -use support::{basic_manifest, project}; +use crate::support::sleep_ms; +use crate::support::{basic_manifest, project}; #[test] fn binary_with_debug() { diff --git a/tests/testsuite/overrides.rs b/tests/testsuite/overrides.rs index bb5e88fc7..e5490566b 100644 --- a/tests/testsuite/overrides.rs +++ b/tests/testsuite/overrides.rs @@ -1,7 +1,7 @@ -use support::git; -use support::paths; -use support::registry::Package; -use support::{basic_manifest, project}; +use crate::support::git; +use crate::support::paths; +use crate::support::registry::Package; +use crate::support::{basic_manifest, project}; #[test] fn override_simple() { diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index d34951f89..dc3fe5c28 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -5,9 +5,9 @@ use std::path::{Path, PathBuf}; use flate2::read::GzDecoder; use git2; -use support::registry::Package; -use support::{basic_manifest, git, is_nightly, path2url, paths, project, registry}; -use support::{cargo_process, sleep_ms}; +use crate::support::registry::Package; +use crate::support::{basic_manifest, git, is_nightly, path2url, paths, project, registry}; +use crate::support::{cargo_process, sleep_ms}; use tar::Archive; #[test] diff --git a/tests/testsuite/patch.rs b/tests/testsuite/patch.rs index 829880344..07eda0c05 100644 --- a/tests/testsuite/patch.rs +++ b/tests/testsuite/patch.rs @@ -1,10 +1,10 @@ use std::fs::{self, File}; use std::io::{Read, Write}; -use support::git; -use support::paths; -use support::registry::Package; -use support::{basic_manifest, project}; +use crate::support::git; +use crate::support::paths; +use crate::support::registry::Package; +use crate::support::{basic_manifest, project}; use toml; #[test] diff --git a/tests/testsuite/path.rs b/tests/testsuite/path.rs index 086a536b8..fbb80c279 100644 --- a/tests/testsuite/path.rs +++ b/tests/testsuite/path.rs @@ -1,10 +1,10 @@ use std::fs::{self, File}; use std::io::prelude::*; -use support::paths::{self, CargoPathExt}; -use support::registry::Package; -use support::sleep_ms; -use support::{basic_lib_manifest, basic_manifest, main_file, project}; +use crate::support::paths::{self, CargoPathExt}; +use crate::support::registry::Package; +use crate::support::sleep_ms; +use crate::support::{basic_lib_manifest, basic_manifest, main_file, project}; #[test] #[cfg(not(windows))] // I have no idea why this is failing spuriously on diff --git a/tests/testsuite/plugins.rs b/tests/testsuite/plugins.rs index 01f46bcb5..8d93961b5 100644 --- a/tests/testsuite/plugins.rs +++ b/tests/testsuite/plugins.rs @@ -1,5 +1,5 @@ -use support::{basic_manifest, project}; -use support::{is_nightly, rustc_host}; +use crate::support::{basic_manifest, project}; +use crate::support::{is_nightly, rustc_host}; #[test] fn plugin_to_the_max() { diff --git a/tests/testsuite/proc_macro.rs b/tests/testsuite/proc_macro.rs index b5af731b4..c42a996e8 100644 --- a/tests/testsuite/proc_macro.rs +++ b/tests/testsuite/proc_macro.rs @@ -1,5 +1,5 @@ -use support::is_nightly; -use support::project; +use crate::support::is_nightly; +use crate::support::project; #[test] fn probe_cfg_before_crate_type_discovery() { diff --git a/tests/testsuite/profile_config.rs b/tests/testsuite/profile_config.rs index 0a22ac5f6..53c63e417 100644 --- a/tests/testsuite/profile_config.rs +++ b/tests/testsuite/profile_config.rs @@ -1,4 +1,4 @@ -use support::{basic_lib_manifest, paths, project}; +use crate::support::{basic_lib_manifest, paths, project}; #[test] fn profile_config_gated() { diff --git a/tests/testsuite/profile_overrides.rs b/tests/testsuite/profile_overrides.rs index 6fb55510f..74e00ef4f 100644 --- a/tests/testsuite/profile_overrides.rs +++ b/tests/testsuite/profile_overrides.rs @@ -1,4 +1,4 @@ -use support::{basic_lib_manifest, basic_manifest, project}; +use crate::support::{basic_lib_manifest, basic_manifest, project}; #[test] fn profile_override_gated() { diff --git a/tests/testsuite/profile_targets.rs b/tests/testsuite/profile_targets.rs index c5598cae6..4406cc3da 100644 --- a/tests/testsuite/profile_targets.rs +++ b/tests/testsuite/profile_targets.rs @@ -1,5 +1,5 @@ -use support::is_nightly; -use support::{basic_manifest, project, Project}; +use crate::support::is_nightly; +use crate::support::{basic_manifest, project, Project}; // These tests try to exercise exactly which profiles are selected for every // target. diff --git a/tests/testsuite/profiles.rs b/tests/testsuite/profiles.rs index cac62cd74..3bc78b615 100644 --- a/tests/testsuite/profiles.rs +++ b/tests/testsuite/profiles.rs @@ -1,7 +1,7 @@ use std::env; -use support::is_nightly; -use support::project; +use crate::support::is_nightly; +use crate::support::project; #[test] fn profile_overrides() { diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs index 53b6cb3e5..a9b4aab56 100644 --- a/tests/testsuite/publish.rs +++ b/tests/testsuite/publish.rs @@ -3,9 +3,9 @@ use std::io::prelude::*; use std::io::SeekFrom; use flate2::read::GzDecoder; -use support::git::repo; -use support::paths; -use support::{basic_manifest, project, publish}; +use crate::support::git::repo; +use crate::support::paths; +use crate::support::{basic_manifest, project, publish}; use tar::Archive; #[test] diff --git a/tests/testsuite/read_manifest.rs b/tests/testsuite/read_manifest.rs index c116f2a16..82f9e2018 100644 --- a/tests/testsuite/read_manifest.rs +++ b/tests/testsuite/read_manifest.rs @@ -1,4 +1,4 @@ -use support::{basic_bin_manifest, main_file, project}; +use crate::support::{basic_bin_manifest, main_file, project}; static MANIFEST_OUTPUT: &'static str = r#" { diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs index 804eba4bc..6f130221d 100644 --- a/tests/testsuite/registry.rs +++ b/tests/testsuite/registry.rs @@ -3,11 +3,11 @@ use std::io::prelude::*; use std::path::PathBuf; use cargo::util::paths::remove_dir_all; -use support::cargo_process; -use support::git; -use support::paths::{self, CargoPathExt}; -use support::registry::{self, Package, Dependency}; -use support::{basic_manifest, project}; +use crate::support::cargo_process; +use crate::support::git; +use crate::support::paths::{self, CargoPathExt}; +use crate::support::registry::{self, Package, Dependency}; +use crate::support::{basic_manifest, project}; use url::Url; fn registry_path() -> PathBuf { diff --git a/tests/testsuite/rename_deps.rs b/tests/testsuite/rename_deps.rs index c8ee06dbc..cc75e5ee0 100644 --- a/tests/testsuite/rename_deps.rs +++ b/tests/testsuite/rename_deps.rs @@ -1,7 +1,7 @@ -use support::git; -use support::paths; -use support::registry::Package; -use support::{basic_manifest, project}; +use crate::support::git; +use crate::support::paths; +use crate::support::registry::Package; +use crate::support::{basic_manifest, project}; #[test] fn rename_dependency() { diff --git a/tests/testsuite/required_features.rs b/tests/testsuite/required_features.rs index 6f174e1bf..9818257d2 100644 --- a/tests/testsuite/required_features.rs +++ b/tests/testsuite/required_features.rs @@ -1,6 +1,6 @@ -use support::install::{cargo_home, assert_has_installed_exe, assert_has_not_installed_exe}; -use support::is_nightly; -use support::project; +use crate::support::install::{cargo_home, assert_has_installed_exe, assert_has_not_installed_exe}; +use crate::support::is_nightly; +use crate::support::project; #[test] fn build_bin_default_features() { diff --git a/tests/testsuite/resolve.rs b/tests/testsuite/resolve.rs index ce66ce062..bec2d6f35 100644 --- a/tests/testsuite/resolve.rs +++ b/tests/testsuite/resolve.rs @@ -4,9 +4,9 @@ use cargo::core::dependency::Kind; use cargo::core::{enable_nightly_features, Dependency}; use cargo::util::Config; -use support::project; -use support::registry::Package; -use support::resolver::{ +use crate::support::project; +use crate::support::registry::Package; +use crate::support::resolver::{ assert_contains, assert_same, dep, dep_kind, dep_loc, dep_req, loc_names, names, pkg, pkg_dep, pkg_id, pkg_loc, registry, registry_strategy, resolve, resolve_and_validated, resolve_with_config, PrettyPrintRegistry, ToDep, ToPkgId, diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs index 728238ebc..968734b15 100644 --- a/tests/testsuite/run.rs +++ b/tests/testsuite/run.rs @@ -1,6 +1,6 @@ use cargo::util::paths::dylib_path_envvar; -use support; -use support::{basic_bin_manifest, basic_lib_manifest, project, Project}; +use crate::support; +use crate::support::{basic_bin_manifest, basic_lib_manifest, project, Project}; #[test] fn simple() { diff --git a/tests/testsuite/rustc.rs b/tests/testsuite/rustc.rs index 44b8a45f1..dbdf8516e 100644 --- a/tests/testsuite/rustc.rs +++ b/tests/testsuite/rustc.rs @@ -1,4 +1,4 @@ -use support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project}; +use crate::support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, project}; const CARGO_RUSTC_ERROR: &str = "[ERROR] extra arguments to `rustc` can only be passed to one target, consider filtering diff --git a/tests/testsuite/rustc_info_cache.rs b/tests/testsuite/rustc_info_cache.rs index defd26dae..882c3cb36 100644 --- a/tests/testsuite/rustc_info_cache.rs +++ b/tests/testsuite/rustc_info_cache.rs @@ -1,6 +1,6 @@ use std::env; -use support::paths::CargoPathExt; -use support::{basic_manifest, project}; +use crate::support::paths::CargoPathExt; +use crate::support::{basic_manifest, project}; #[test] fn rustc_info_cache() { diff --git a/tests/testsuite/rustdoc.rs b/tests/testsuite/rustdoc.rs index 35110349f..1ad277c29 100644 --- a/tests/testsuite/rustdoc.rs +++ b/tests/testsuite/rustdoc.rs @@ -1,4 +1,4 @@ -use support::{basic_manifest, project}; +use crate::support::{basic_manifest, project}; #[test] fn rustdoc_simple() { diff --git a/tests/testsuite/rustdocflags.rs b/tests/testsuite/rustdocflags.rs index d99e805bf..ad9546be3 100644 --- a/tests/testsuite/rustdocflags.rs +++ b/tests/testsuite/rustdocflags.rs @@ -1,4 +1,4 @@ -use support::project; +use crate::support::project; #[test] fn parses_env() { diff --git a/tests/testsuite/rustflags.rs b/tests/testsuite/rustflags.rs index 1cf02da61..08c96b54d 100644 --- a/tests/testsuite/rustflags.rs +++ b/tests/testsuite/rustflags.rs @@ -1,8 +1,8 @@ use std::fs::{self, File}; use std::io::Write; -use support::rustc_host; -use support::{basic_lib_manifest, basic_manifest, paths, project, project_in_home}; +use crate::support::rustc_host; +use crate::support::{basic_lib_manifest, basic_manifest, paths, project, project_in_home}; #[test] fn env_rustflags_normal_source() { diff --git a/tests/testsuite/search.rs b/tests/testsuite/search.rs index bd59b39e7..0b70a63ef 100644 --- a/tests/testsuite/search.rs +++ b/tests/testsuite/search.rs @@ -2,10 +2,10 @@ use std::fs::{self, File}; use std::io::prelude::*; use std::path::Path; -use support::cargo_process; -use support::git::repo; -use support::paths; -use support::registry::{api_path, registry as registry_url, registry_path}; +use crate::support::cargo_process; +use crate::support::git::repo; +use crate::support::paths; +use crate::support::registry::{api_path, registry as registry_url, registry_path}; use url::Url; fn api() -> Url { diff --git a/tests/testsuite/shell_quoting.rs b/tests/testsuite/shell_quoting.rs index dcbb0fcb8..203831dc7 100644 --- a/tests/testsuite/shell_quoting.rs +++ b/tests/testsuite/shell_quoting.rs @@ -2,7 +2,7 @@ //! in the output, their arguments are quoted properly //! so that the command can be run in a terminal -use support::project; +use crate::support::project; #[test] fn features_are_quoted() { diff --git a/tests/testsuite/small_fd_limits.rs b/tests/testsuite/small_fd_limits.rs index 9e15f8548..672439a7d 100644 --- a/tests/testsuite/small_fd_limits.rs +++ b/tests/testsuite/small_fd_limits.rs @@ -4,10 +4,10 @@ use std::path::PathBuf; use std::process::Command; use git2; -use support::git; -use support::paths; -use support::project; -use support::registry::Package; +use crate::support::git; +use crate::support::paths; +use crate::support::project; +use crate::support::registry::Package; use url::Url; diff --git a/tests/testsuite/support/cross_compile.rs b/tests/testsuite/support/cross_compile.rs index 675e77e97..3f94a8102 100644 --- a/tests/testsuite/support/cross_compile.rs +++ b/tests/testsuite/support/cross_compile.rs @@ -3,7 +3,7 @@ use std::process::Command; use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT}; use std::sync::{Once, ONCE_INIT}; -use support::{basic_bin_manifest, main_file, project}; +use crate::support::{basic_bin_manifest, main_file, project}; pub fn disabled() -> bool { // First, disable if ./configure requested so diff --git a/tests/testsuite/support/git.rs b/tests/testsuite/support/git.rs index 656727dd2..9f59797b0 100644 --- a/tests/testsuite/support/git.rs +++ b/tests/testsuite/support/git.rs @@ -46,7 +46,7 @@ use cargo::util::ProcessError; use git2; use url::Url; -use support::{path2url, project, Project, ProjectBuilder}; +use crate::support::{path2url, project, Project, ProjectBuilder}; #[must_use] pub struct RepoBuilder { diff --git a/tests/testsuite/support/install.rs b/tests/testsuite/support/install.rs index 9267b57e4..e05f6e882 100644 --- a/tests/testsuite/support/install.rs +++ b/tests/testsuite/support/install.rs @@ -1,6 +1,6 @@ use std::path::{Path, PathBuf}; -use support::paths; +use crate::support::paths; /// Used by `cargo install` tests to assert an executable binary /// has been installed. Example usage: diff --git a/tests/testsuite/support/mod.rs b/tests/testsuite/support/mod.rs index 2c7c25e7f..b602fa4ef 100644 --- a/tests/testsuite/support/mod.rs +++ b/tests/testsuite/support/mod.rs @@ -382,7 +382,7 @@ impl Project { /// .with_stdout("bar\n") /// .run(); pub fn process>(&self, program: T) -> Execs { - let mut p = ::support::process(program); + let mut p = crate::support::process(program); p.cwd(self.root()); execs().with_process_builder(p) } diff --git a/tests/testsuite/support/publish.rs b/tests/testsuite/support/publish.rs index e15566918..8a16afc73 100644 --- a/tests/testsuite/support/publish.rs +++ b/tests/testsuite/support/publish.rs @@ -2,8 +2,8 @@ use std::fs::{self, File}; use std::io::prelude::*; use std::path::PathBuf; -use support::git::{repo, Repository}; -use support::paths; +use crate::support::git::{repo, Repository}; +use crate::support::paths; use url::Url; diff --git a/tests/testsuite/support/registry.rs b/tests/testsuite/support/registry.rs index 9fda183c9..d2b2748e6 100644 --- a/tests/testsuite/support/registry.rs +++ b/tests/testsuite/support/registry.rs @@ -11,8 +11,8 @@ use hex; use tar::{Builder, Header}; use url::Url; -use support::git::repo; -use support::paths; +use crate::support::git::repo; +use crate::support::paths; pub fn registry_path() -> PathBuf { paths::root().join("registry") diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs index a16dfb3b0..bca8f4288 100644 --- a/tests/testsuite/test.rs +++ b/tests/testsuite/test.rs @@ -2,10 +2,10 @@ use std::fs::File; use std::io::prelude::*; use cargo; -use support::paths::CargoPathExt; -use support::registry::Package; -use support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, cargo_exe, project}; -use support::{is_nightly, rustc_host, sleep_ms}; +use crate::support::paths::CargoPathExt; +use crate::support::registry::Package; +use crate::support::{basic_bin_manifest, basic_lib_manifest, basic_manifest, cargo_exe, project}; +use crate::support::{is_nightly, rustc_host, sleep_ms}; #[test] fn cargo_test_simple() { diff --git a/tests/testsuite/tool_paths.rs b/tests/testsuite/tool_paths.rs index d952991f3..ce06fd542 100644 --- a/tests/testsuite/tool_paths.rs +++ b/tests/testsuite/tool_paths.rs @@ -1,5 +1,5 @@ -use support::rustc_host; -use support::{basic_lib_manifest, project}; +use crate::support::rustc_host; +use crate::support::{basic_lib_manifest, project}; #[test] fn pathless_tools() { diff --git a/tests/testsuite/update.rs b/tests/testsuite/update.rs index be527b288..e0de2b5cc 100644 --- a/tests/testsuite/update.rs +++ b/tests/testsuite/update.rs @@ -1,8 +1,8 @@ use std::fs::File; use std::io::prelude::*; -use support::registry::Package; -use support::{basic_manifest, project}; +use crate::support::registry::Package; +use crate::support::{basic_manifest, project}; #[test] fn minor_update_two_places() { diff --git a/tests/testsuite/verify_project.rs b/tests/testsuite/verify_project.rs index 060e3e3df..3c15b9cef 100644 --- a/tests/testsuite/verify_project.rs +++ b/tests/testsuite/verify_project.rs @@ -1,4 +1,4 @@ -use support::{basic_bin_manifest, main_file, project}; +use crate::support::{basic_bin_manifest, main_file, project}; fn verify_project_success_output() -> String { r#"{"success":"true"}"#.into() diff --git a/tests/testsuite/version.rs b/tests/testsuite/version.rs index cd8cded24..6a3e2576a 100644 --- a/tests/testsuite/version.rs +++ b/tests/testsuite/version.rs @@ -1,5 +1,5 @@ use cargo; -use support::project; +use crate::support::project; #[test] fn simple() { diff --git a/tests/testsuite/warn_on_failure.rs b/tests/testsuite/warn_on_failure.rs index f4f8abae0..a34fad970 100644 --- a/tests/testsuite/warn_on_failure.rs +++ b/tests/testsuite/warn_on_failure.rs @@ -1,5 +1,5 @@ -use support::registry::Package; -use support::{project, Project}; +use crate::support::registry::Package; +use crate::support::{project, Project}; static WARNING1: &'static str = "Hello! I'm a warning. :)"; static WARNING2: &'static str = "And one more!"; diff --git a/tests/testsuite/workspaces.rs b/tests/testsuite/workspaces.rs index fb3d64ac5..ebe26276b 100644 --- a/tests/testsuite/workspaces.rs +++ b/tests/testsuite/workspaces.rs @@ -2,9 +2,9 @@ use std::env; use std::fs::{self, File}; use std::io::{Read, Write}; -use support::registry::Package; -use support::sleep_ms; -use support::{basic_lib_manifest, basic_manifest, git, project}; +use crate::support::registry::Package; +use crate::support::sleep_ms; +use crate::support::{basic_lib_manifest, basic_manifest, git, project}; #[test] fn simple_explicit() { From 6d1d3a684053fb078471915b2afea02579315b55 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 6 Dec 2018 20:21:24 +0100 Subject: [PATCH 2/5] Fix 2018 edition idioms --- src/bin/cargo/cli.rs | 4 ++-- src/bin/cargo/commands/bench.rs | 2 +- src/bin/cargo/commands/build.rs | 2 +- src/bin/cargo/commands/check.rs | 2 +- src/bin/cargo/commands/clean.rs | 2 +- src/bin/cargo/commands/doc.rs | 2 +- src/bin/cargo/commands/fetch.rs | 2 +- src/bin/cargo/commands/fix.rs | 2 +- src/bin/cargo/commands/generate_lockfile.rs | 2 +- src/bin/cargo/commands/git_checkout.rs | 2 +- src/bin/cargo/commands/init.rs | 2 +- src/bin/cargo/commands/install.rs | 2 +- src/bin/cargo/commands/locate_project.rs | 2 +- src/bin/cargo/commands/login.rs | 2 +- src/bin/cargo/commands/metadata.rs | 2 +- src/bin/cargo/commands/mod.rs | 2 +- src/bin/cargo/commands/new.rs | 2 +- src/bin/cargo/commands/owner.rs | 2 +- src/bin/cargo/commands/package.rs | 2 +- src/bin/cargo/commands/pkgid.rs | 2 +- src/bin/cargo/commands/publish.rs | 2 +- src/bin/cargo/commands/read_manifest.rs | 2 +- src/bin/cargo/commands/run.rs | 2 +- src/bin/cargo/commands/rustc.rs | 2 +- src/bin/cargo/commands/rustdoc.rs | 2 +- src/bin/cargo/commands/search.rs | 2 +- src/bin/cargo/commands/test.rs | 2 +- src/bin/cargo/commands/uninstall.rs | 2 +- src/bin/cargo/commands/update.rs | 2 +- src/bin/cargo/commands/verify_project.rs | 2 +- src/bin/cargo/commands/version.rs | 2 +- src/bin/cargo/commands/yank.rs | 2 +- src/bin/cargo/main.rs | 12 +++++------ src/crates-io/lib.rs | 8 ++++---- tests/testsuite/build_auth.rs | 2 +- tests/testsuite/cargo_command.rs | 2 +- tests/testsuite/main.rs | 22 ++++++++++----------- tests/testsuite/support/mod.rs | 2 +- tests/testsuite/support/resolver.rs | 6 +++--- 39 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs index f60adfe33..617b8e073 100644 --- a/src/bin/cargo/cli.rs +++ b/src/bin/cargo/cli.rs @@ -1,4 +1,4 @@ -extern crate clap; +use clap; use clap::{AppSettings, Arg, ArgMatches}; @@ -132,7 +132,7 @@ fn expand_aliases( Ok(args) } -fn execute_subcommand(config: &mut Config, args: &ArgMatches) -> CliResult { +fn execute_subcommand(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let (cmd, subcommand_args) = match args.subcommand() { (cmd, Some(args)) => (cmd, args), _ => { diff --git a/src/bin/cargo/commands/bench.rs b/src/bin/cargo/commands/bench.rs index 3846f7b1b..f55689c0b 100644 --- a/src/bin/cargo/commands/bench.rs +++ b/src/bin/cargo/commands/bench.rs @@ -70,7 +70,7 @@ Compilation can be customized with the `bench` profile in the manifest. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let mut compile_opts = args.compile_options(config, CompileMode::Bench)?; compile_opts.build_config.release = true; diff --git a/src/bin/cargo/commands/build.rs b/src/bin/cargo/commands/build.rs index 418d0c53d..437dbe5e0 100644 --- a/src/bin/cargo/commands/build.rs +++ b/src/bin/cargo/commands/build.rs @@ -46,7 +46,7 @@ the --release flag will use the `release` profile instead. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let mut compile_opts = args.compile_options(config, CompileMode::Build)?; compile_opts.export_dir = args.value_of_path("out-dir", config); diff --git a/src/bin/cargo/commands/check.rs b/src/bin/cargo/commands/check.rs index a7877b7de..261d503f9 100644 --- a/src/bin/cargo/commands/check.rs +++ b/src/bin/cargo/commands/check.rs @@ -53,7 +53,7 @@ The `--profile test` flag can be used to check unit tests with the ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let test = match args.value_of("profile") { Some("test") => true, diff --git a/src/bin/cargo/commands/clean.rs b/src/bin/cargo/commands/clean.rs index 55ba25593..0fa45495f 100644 --- a/src/bin/cargo/commands/clean.rs +++ b/src/bin/cargo/commands/clean.rs @@ -21,7 +21,7 @@ and its format, see the `cargo help pkgid` command. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let opts = CleanOptions { config, diff --git a/src/bin/cargo/commands/doc.rs b/src/bin/cargo/commands/doc.rs index dac95f376..b32c793ff 100644 --- a/src/bin/cargo/commands/doc.rs +++ b/src/bin/cargo/commands/doc.rs @@ -45,7 +45,7 @@ the `cargo help pkgid` command. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let mode = CompileMode::Doc { deps: !args.is_present("no-deps"), diff --git a/src/bin/cargo/commands/fetch.rs b/src/bin/cargo/commands/fetch.rs index e777402e8..4322b5a42 100644 --- a/src/bin/cargo/commands/fetch.rs +++ b/src/bin/cargo/commands/fetch.rs @@ -22,7 +22,7 @@ all updated. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let opts = FetchOptions { diff --git a/src/bin/cargo/commands/fix.rs b/src/bin/cargo/commands/fix.rs index adfe16559..5d1b6e3a3 100644 --- a/src/bin/cargo/commands/fix.rs +++ b/src/bin/cargo/commands/fix.rs @@ -104,7 +104,7 @@ https://github.com/rust-lang/cargo ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let test = match args.value_of("profile") { Some("test") => true, diff --git a/src/bin/cargo/commands/generate_lockfile.rs b/src/bin/cargo/commands/generate_lockfile.rs index d473e41af..6e5135a17 100644 --- a/src/bin/cargo/commands/generate_lockfile.rs +++ b/src/bin/cargo/commands/generate_lockfile.rs @@ -8,7 +8,7 @@ pub fn cli() -> App { .arg_manifest_path() } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; ops::generate_lockfile(&ws)?; Ok(()) diff --git a/src/bin/cargo/commands/git_checkout.rs b/src/bin/cargo/commands/git_checkout.rs index 95c404f04..c229307c4 100644 --- a/src/bin/cargo/commands/git_checkout.rs +++ b/src/bin/cargo/commands/git_checkout.rs @@ -21,7 +21,7 @@ pub fn cli() -> App { ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let url = args.value_of("url").unwrap().to_url()?; let reference = args.value_of("reference").unwrap(); diff --git a/src/bin/cargo/commands/init.rs b/src/bin/cargo/commands/init.rs index 57dc038ec..8fb765202 100644 --- a/src/bin/cargo/commands/init.rs +++ b/src/bin/cargo/commands/init.rs @@ -10,7 +10,7 @@ pub fn cli() -> App { .arg_new_opts() } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let opts = args.new_options(config)?; ops::init(&opts, config)?; config diff --git a/src/bin/cargo/commands/install.rs b/src/bin/cargo/commands/install.rs index f58caf206..a47bcd903 100644 --- a/src/bin/cargo/commands/install.rs +++ b/src/bin/cargo/commands/install.rs @@ -74,7 +74,7 @@ continuous integration systems.", ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let registry = args.registry(config)?; config.reload_rooted_at_cargo_home()?; diff --git a/src/bin/cargo/commands/locate_project.rs b/src/bin/cargo/commands/locate_project.rs index 9c3e94565..79fa1c8bb 100644 --- a/src/bin/cargo/commands/locate_project.rs +++ b/src/bin/cargo/commands/locate_project.rs @@ -13,7 +13,7 @@ pub struct ProjectLocation<'a> { root: &'a str, } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let root = args.root_manifest(config)?; let root = root.to_str() diff --git a/src/bin/cargo/commands/login.rs b/src/bin/cargo/commands/login.rs index 903b96535..014a93849 100644 --- a/src/bin/cargo/commands/login.rs +++ b/src/bin/cargo/commands/login.rs @@ -18,7 +18,7 @@ pub fn cli() -> App { .arg(opt("registry", "Registry to use").value_name("REGISTRY")) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let registry = args.registry(config)?; let token = match args.value_of("token") { diff --git a/src/bin/cargo/commands/metadata.rs b/src/bin/cargo/commands/metadata.rs index c3552201c..eb2a453bb 100644 --- a/src/bin/cargo/commands/metadata.rs +++ b/src/bin/cargo/commands/metadata.rs @@ -24,7 +24,7 @@ pub fn cli() -> App { ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let version = match args.value_of("format-version") { diff --git a/src/bin/cargo/commands/mod.rs b/src/bin/cargo/commands/mod.rs index 6bc89f8ea..526bcccae 100644 --- a/src/bin/cargo/commands/mod.rs +++ b/src/bin/cargo/commands/mod.rs @@ -35,7 +35,7 @@ pub fn builtin() -> Vec { ] } - pub fn builtin_exec(cmd: &str) -> Option CliResult> { + pub fn builtin_exec(cmd: &str) -> Option) -> CliResult> { let f = match cmd { "bench" => bench::exec, "build" => build::exec, diff --git a/src/bin/cargo/commands/new.rs b/src/bin/cargo/commands/new.rs index 38b7552a1..770df6506 100644 --- a/src/bin/cargo/commands/new.rs +++ b/src/bin/cargo/commands/new.rs @@ -10,7 +10,7 @@ pub fn cli() -> App { .arg_new_opts() } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let opts = args.new_options(config)?; ops::new(&opts, config)?; diff --git a/src/bin/cargo/commands/owner.rs b/src/bin/cargo/commands/owner.rs index 9a08e540e..0fa0268a7 100644 --- a/src/bin/cargo/commands/owner.rs +++ b/src/bin/cargo/commands/owner.rs @@ -28,7 +28,7 @@ Explicitly named owners can also modify the set of owners, so take care! ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let registry = args.registry(config)?; let opts = OwnersOptions { krate: args.value_of("crate").map(|s| s.to_string()), diff --git a/src/bin/cargo/commands/package.rs b/src/bin/cargo/commands/package.rs index c529fa24e..d29891622 100644 --- a/src/bin/cargo/commands/package.rs +++ b/src/bin/cargo/commands/package.rs @@ -29,7 +29,7 @@ pub fn cli() -> App { .arg_jobs() } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; ops::package( &ws, diff --git a/src/bin/cargo/commands/pkgid.rs b/src/bin/cargo/commands/pkgid.rs index 41d6275e3..30565744d 100644 --- a/src/bin/cargo/commands/pkgid.rs +++ b/src/bin/cargo/commands/pkgid.rs @@ -32,7 +32,7 @@ Example Package IDs ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let spec = args.value_of("spec").or_else(|| args.value_of("package")); let spec = ops::pkgid(&ws, spec)?; diff --git a/src/bin/cargo/commands/publish.rs b/src/bin/cargo/commands/publish.rs index 4053a2b97..b2eb7abb0 100644 --- a/src/bin/cargo/commands/publish.rs +++ b/src/bin/cargo/commands/publish.rs @@ -23,7 +23,7 @@ pub fn cli() -> App { .arg(opt("registry", "Registry to publish to").value_name("REGISTRY")) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let registry = args.registry(config)?; let ws = args.workspace(config)?; let index = args.index(config)?; diff --git a/src/bin/cargo/commands/read_manifest.rs b/src/bin/cargo/commands/read_manifest.rs index 0fe2748cd..b88787064 100644 --- a/src/bin/cargo/commands/read_manifest.rs +++ b/src/bin/cargo/commands/read_manifest.rs @@ -14,7 +14,7 @@ Deprecated, use `cargo metadata --no-deps` instead.\ .arg_manifest_path() } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; print_json(&ws.current()?); Ok(()) diff --git a/src/bin/cargo/commands/run.rs b/src/bin/cargo/commands/run.rs index 0bc2fb525..20a3e89d2 100644 --- a/src/bin/cargo/commands/run.rs +++ b/src/bin/cargo/commands/run.rs @@ -36,7 +36,7 @@ run. If you're passing arguments to both Cargo and the binary, the ones after ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let mut compile_opts = args.compile_options(config, CompileMode::Build)?; diff --git a/src/bin/cargo/commands/rustc.rs b/src/bin/cargo/commands/rustc.rs index 9bbb30d45..53a757650 100644 --- a/src/bin/cargo/commands/rustc.rs +++ b/src/bin/cargo/commands/rustc.rs @@ -46,7 +46,7 @@ processes spawned by Cargo, use the $RUSTFLAGS environment variable or the ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let mode = match args.value_of("profile") { Some("dev") | None => CompileMode::Build, diff --git a/src/bin/cargo/commands/rustdoc.rs b/src/bin/cargo/commands/rustdoc.rs index c28a6bc2b..14bde6fe2 100644 --- a/src/bin/cargo/commands/rustdoc.rs +++ b/src/bin/cargo/commands/rustdoc.rs @@ -48,7 +48,7 @@ the `cargo help pkgid` command. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let mut compile_opts = args.compile_options_for_single_package(config, CompileMode::Doc { deps: false })?; diff --git a/src/bin/cargo/commands/search.rs b/src/bin/cargo/commands/search.rs index 04776cf0b..5c8d42360 100644 --- a/src/bin/cargo/commands/search.rs +++ b/src/bin/cargo/commands/search.rs @@ -18,7 +18,7 @@ pub fn cli() -> App { .arg(opt("registry", "Registry to use").value_name("REGISTRY")) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let registry = args.registry(config)?; let index = args.index(config)?; let limit = args.value_of_u32("limit")?; diff --git a/src/bin/cargo/commands/test.rs b/src/bin/cargo/commands/test.rs index a8df32163..1cdb22e9c 100644 --- a/src/bin/cargo/commands/test.rs +++ b/src/bin/cargo/commands/test.rs @@ -89,7 +89,7 @@ To get the list of all options available for the test binaries use this: ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let mut compile_opts = args.compile_options(config, CompileMode::Test)?; diff --git a/src/bin/cargo/commands/uninstall.rs b/src/bin/cargo/commands/uninstall.rs index 189c32fd1..a81f52d72 100644 --- a/src/bin/cargo/commands/uninstall.rs +++ b/src/bin/cargo/commands/uninstall.rs @@ -19,7 +19,7 @@ only uninstall particular binaries. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let root = args.value_of("root"); let specs = args .values_of("spec") diff --git a/src/bin/cargo/commands/update.rs b/src/bin/cargo/commands/update.rs index 6b2bd59ef..766226d0f 100644 --- a/src/bin/cargo/commands/update.rs +++ b/src/bin/cargo/commands/update.rs @@ -37,7 +37,7 @@ For more information about package id specifications, see `cargo help pkgid`. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let ws = args.workspace(config)?; let update_opts = UpdateOptions { diff --git a/src/bin/cargo/commands/verify_project.rs b/src/bin/cargo/commands/verify_project.rs index dc36eb417..0b17e4e50 100644 --- a/src/bin/cargo/commands/verify_project.rs +++ b/src/bin/cargo/commands/verify_project.rs @@ -11,7 +11,7 @@ pub fn cli() -> App { .arg_manifest_path() } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { fn fail(reason: &str, value: &str) -> ! { let mut h = HashMap::new(); h.insert(reason.to_string(), value.to_string()); diff --git a/src/bin/cargo/commands/version.rs b/src/bin/cargo/commands/version.rs index c85bf4ee9..d546ff705 100644 --- a/src/bin/cargo/commands/version.rs +++ b/src/bin/cargo/commands/version.rs @@ -6,7 +6,7 @@ pub fn cli() -> App { subcommand("version").about("Show version information") } -pub fn exec(_config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(_config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let verbose = args.occurrences_of("verbose") > 0; let version = cli::get_version_string(verbose); print!("{}", version); diff --git a/src/bin/cargo/commands/yank.rs b/src/bin/cargo/commands/yank.rs index 4cc9a9911..a99714816 100644 --- a/src/bin/cargo/commands/yank.rs +++ b/src/bin/cargo/commands/yank.rs @@ -27,7 +27,7 @@ crates to be locked to any yanked version. ) } -pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { +pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult { let registry = args.registry(config)?; ops::yank( diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs index f19a81b93..ad40f1b7a 100644 --- a/src/bin/cargo/main.rs +++ b/src/bin/cargo/main.rs @@ -1,20 +1,20 @@ #![cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments))] // large project #![cfg_attr(feature = "cargo-clippy", allow(clippy::redundant_closure))] // there's a false positive -extern crate cargo; -extern crate clap; +use cargo; + #[cfg(feature = "pretty-env-logger")] extern crate pretty_env_logger; #[cfg(not(feature = "pretty-env-logger"))] extern crate env_logger; #[macro_use] extern crate failure; -extern crate git2_curl; -extern crate log; +use git2_curl; + #[macro_use] extern crate serde_derive; -extern crate serde_json; -extern crate toml; + + use std::collections::BTreeSet; use std::env; diff --git a/src/crates-io/lib.rs b/src/crates-io/lib.rs index 65843e7dc..2f7cef2b7 100644 --- a/src/crates-io/lib.rs +++ b/src/crates-io/lib.rs @@ -1,13 +1,13 @@ #![allow(unknown_lints)] #![cfg_attr(feature = "cargo-clippy", allow(identity_op))] // used for vertical alignment -extern crate curl; + #[macro_use] extern crate failure; #[macro_use] extern crate serde_derive; -extern crate serde_json; -extern crate url; +use serde_json; + use std::collections::BTreeMap; use std::fs::File; @@ -302,7 +302,7 @@ impl Registry { } } -fn handle(handle: &mut Easy, read: &mut FnMut(&mut [u8]) -> usize) -> Result { +fn handle(handle: &mut Easy, read: &mut dyn FnMut(&mut [u8]) -> usize) -> Result { let mut headers = Vec::new(); let mut body = Vec::new(); { diff --git a/tests/testsuite/build_auth.rs b/tests/testsuite/build_auth.rs index ace79b445..9b849fdb5 100644 --- a/tests/testsuite/build_auth.rs +++ b/tests/testsuite/build_auth.rs @@ -15,7 +15,7 @@ fn http_auth_offered() { let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); - fn headers(rdr: &mut BufRead) -> HashSet { + fn headers(rdr: &mut dyn BufRead) -> HashSet { let valid = ["GET", "Authorization", "Accept"]; rdr.lines() .map(|s| s.unwrap()) diff --git a/tests/testsuite/cargo_command.rs b/tests/testsuite/cargo_command.rs index b3963f22f..c20b5f4be 100644 --- a/tests/testsuite/cargo_command.rs +++ b/tests/testsuite/cargo_command.rs @@ -18,7 +18,7 @@ enum FakeKind<'a> { /// Add an empty file with executable flags (and platform-dependent suffix). /// TODO: move this to `Project` if other cases using this emerge. -fn fake_file(proj: Project, dir: &Path, name: &str, kind: &FakeKind) -> Project { +fn fake_file(proj: Project, dir: &Path, name: &str, kind: &FakeKind<'_>) -> Project { let path = proj .root() .join(dir) diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs index 969fe69f6..cab299af4 100644 --- a/tests/testsuite/main.rs +++ b/tests/testsuite/main.rs @@ -2,25 +2,25 @@ #![cfg_attr(feature = "cargo-clippy", allow(blacklisted_name))] #![cfg_attr(feature = "cargo-clippy", allow(explicit_iter_loop))] -extern crate bufstream; -extern crate cargo; -extern crate filetime; -extern crate flate2; -extern crate git2; -extern crate glob; -extern crate hex; + +use cargo; +use filetime; + +use git2; + +use hex; #[macro_use] extern crate lazy_static; -extern crate libc; +use libc; #[macro_use] extern crate proptest; #[macro_use] extern crate serde_derive; #[macro_use] extern crate serde_json; -extern crate tar; -extern crate toml; -extern crate url; + +use toml; + #[cfg(windows)] extern crate winapi; diff --git a/tests/testsuite/support/mod.rs b/tests/testsuite/support/mod.rs index b602fa4ef..0967101ee 100644 --- a/tests/testsuite/support/mod.rs +++ b/tests/testsuite/support/mod.rs @@ -1301,7 +1301,7 @@ fn zip_all, I2: Iterator>(a: I1, b: I2) -> Z } impl fmt::Debug for Execs { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "execs") } } diff --git a/tests/testsuite/support/resolver.rs b/tests/testsuite/support/resolver.rs index 9dca8fcfd..af2791946 100644 --- a/tests/testsuite/support/resolver.rs +++ b/tests/testsuite/support/resolver.rs @@ -76,7 +76,7 @@ pub fn resolve_with_config_raw( fn query( &mut self, dep: &Dependency, - f: &mut FnMut(Summary), + f: &mut dyn FnMut(Summary), fuzzy: bool, ) -> CargoResult<()> { for summary in self.0.iter() { @@ -273,7 +273,7 @@ pub fn loc_names(names: &[(&'static str, &'static str)]) -> Vec { pub struct PrettyPrintRegistry(pub Vec); impl fmt::Debug for PrettyPrintRegistry { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "vec![")?; for s in &self.0 { if s.dependencies().is_empty() { @@ -518,7 +518,7 @@ fn meta_test_multiple_versions_strategy() { .current(); let reg = registry(input.clone()); for this in input.iter().rev().take(10) { - let mut res = resolve( + let res = resolve( &pkg_id("root"), vec![dep_req(&this.name(), &format!("={}", this.version()))], ®, From cd87368fc5f0a06bb5996c0fba814bf6b645f2d0 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 7 Dec 2018 10:05:52 +0100 Subject: [PATCH 3/5] Upgrade the minimum supported Rust to 1.31.0 --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a421a7b93..49b353279 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: # increased every 6 weeks or so when the first PR to use a new feature. - env: TARGET=x86_64-unknown-linux-gnu ALT=i686-unknown-linux-gnu - rust: 1.28.0 + rust: 1.31.0 script: - rustup toolchain install nightly - cargo +nightly generate-lockfile -Z minimal-versions diff --git a/appveyor.yml b/appveyor.yml index 282633ee0..02cf710a5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ install: - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - if defined MINIMAL_VERSIONS rustup toolchain install 1.28.0 + - if defined MINIMAL_VERSIONS rustup toolchain install 1.31.0 - if defined OTHER_TARGET rustup target add %OTHER_TARGET% - rustc -V - cargo -V From 8af0a934fef28f6bfc4afe90602cff05a0c743a8 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 7 Dec 2018 17:06:09 +0100 Subject: [PATCH 4/5] Fix Rust 2018 code in Windows code --- src/cargo/util/process_builder.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs index a2f56e7f8..5c8ccaf43 100644 --- a/src/cargo/util/process_builder.rs +++ b/src/cargo/util/process_builder.rs @@ -353,8 +353,8 @@ mod imp { mod imp { extern crate winapi; - use CargoResult; - use util::{process_error, ProcessBuilder}; + use crate::CargoResult; + use crate::util::{process_error, ProcessBuilder}; use self::winapi::shared::minwindef::{BOOL, DWORD, FALSE, TRUE}; use self::winapi::um::consoleapi::SetConsoleCtrlHandler; From 5aebc8af14a57ba1cc6d465c32e3a30220d0c342 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 7 Dec 2018 17:36:54 +0100 Subject: [PATCH 5/5] Finish pushing the minimum Rust to 1.31.0 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 02cf710a5..6a2e25785 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,5 +25,5 @@ test_script: # we don't have ci time to run the full `cargo test` with `minimal-versions` like # - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable test # so we just run `cargo check --tests` like - - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +1.28.0 check --tests + - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +1.31.0 check --tests - if NOT defined MINIMAL_VERSIONS cargo test