From 04e973a1af05c565e5dce4c4d9c14be24253c92f Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Sun, 16 Dec 2018 22:34:44 +0000 Subject: [PATCH] d-ignore-removed-submodules Gbp-Pq: Name d-ignore-removed-submodules.patch --- src/Cargo.toml | 24 ------------------------ src/bootstrap/bootstrap.py | 4 ---- src/bootstrap/builder.rs | 5 +---- src/bootstrap/doc.rs | 2 +- src/doc/index.md | 2 +- 5 files changed, 3 insertions(+), 34 deletions(-) diff --git a/src/Cargo.toml b/src/Cargo.toml index ee997a6ca4..02331b20d9 100644 --- a/src/Cargo.toml +++ b/src/Cargo.toml @@ -6,7 +6,6 @@ members = [ "libtest", "librustc_codegen_llvm", "tools/cargotest", - "tools/clippy", "tools/compiletest", "tools/error_index_generator", "tools/linkchecker", @@ -14,14 +13,8 @@ members = [ "tools/unstable-book-gen", "tools/tidy", "tools/build-manifest", - "tools/remote-test-client", - "tools/remote-test-server", "tools/rust-installer", - "tools/cargo", "tools/rustdoc", - "tools/rls", - "tools/rustfmt", - "tools/miri", "tools/rustdoc-themes", ] exclude = [ @@ -44,24 +37,7 @@ debug-assertions = false debug = false debug-assertions = false -# We want the RLS to use the version of Cargo that we've got vendored in this -# repository to ensure that the same exact version of Cargo is used by both the -# RLS and the Cargo binary itself. The RLS depends on Cargo as a git repository -# so we use a `[patch]` here to override the github repository with our local -# vendored copy. -[patch."https://github.com/rust-lang/cargo"] -cargo = { path = "tools/cargo" } - [patch.crates-io] -# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt` -# that we're shipping as well (to ensure that the rustfmt in RLS and the -# `rustfmt` executable are the same exact version). -rustfmt-nightly = { path = "tools/rustfmt" } - # See comments in `tools/rustc-workspace-hack/README.md` for what's going on # here rustc-workspace-hack = { path = 'tools/rustc-workspace-hack' } - -[patch."https://github.com/rust-lang/rust-clippy"] -clippy_lints = { path = "tools/clippy/clippy_lints" } -rustc_tools_util = { path = "tools/clippy/rustc_tools_util" } diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 88baf87e02..f54f671f93 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -648,10 +648,6 @@ class RustBuild(object): os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] for _ in range(1, self.verbose): args.append("--verbose") - if self.use_locked_deps: - args.append("--locked") - if self.use_vendored_sources: - args.append("--frozen") run(args, env=env, verbose=self.verbose) def build_triple(self): diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 02e9ca9250..43ea2764d6 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1133,10 +1133,7 @@ impl<'a> Builder<'a> { } } - if self.config.locked_deps { - cargo.arg("--locked"); - } - if self.config.vendor || self.is_sudo { + if self.is_sudo { cargo.arg("--frozen"); } diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index f17572325a..e85766d966 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -145,7 +145,7 @@ pub struct CargoBook { impl Step for CargoBook { type Output = (); - const DEFAULT: bool = true; + const DEFAULT: bool = false; fn should_run(run: ShouldRun) -> ShouldRun { let builder = run.builder; diff --git a/src/doc/index.md b/src/doc/index.md index 33ee76739c..8c341aac4f 100644 --- a/src/doc/index.md +++ b/src/doc/index.md @@ -74,7 +74,7 @@ accomplishing various tasks. ## The Cargo Book -[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and dependency manager. +[The Cargo Book](../../cargo-doc/doc/index.html) is a guide to Cargo, Rust's build tool and dependency manager. ## The Rustdoc Book -- 2.30.2