From 12718ec0b318a6fba5f024b4052f203114d712b2 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Mon, 28 Jan 2019 06:02:48 +0000 Subject: [PATCH] d-ignore-removed-submodules Gbp-Pq: Name d-ignore-removed-submodules.patch --- 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/Cargo.toml b/Cargo.toml index b763caa97d..910b485309 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ members = [ "src/libtest", "src/librustc_codegen_llvm", "src/tools/cargotest", - "src/tools/clippy", "src/tools/compiletest", "src/tools/error_index_generator", "src/tools/linkchecker", @@ -14,14 +13,8 @@ members = [ "src/tools/unstable-book-gen", "src/tools/tidy", "src/tools/build-manifest", - "src/tools/remote-test-client", - "src/tools/remote-test-server", "src/tools/rust-installer", - "src/tools/cargo", "src/tools/rustdoc", - "src/tools/rls", - "src/tools/rustfmt", - "src/tools/miri", "src/tools/rustdoc-themes", ] exclude = [ @@ -47,24 +40,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 = "src/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 = "src/tools/rustfmt" } - # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on # here rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' } - -[patch."https://github.com/rust-lang/rust-clippy"] -clippy_lints = { path = "src/tools/clippy/clippy_lints" } -rustc_tools_util = { path = "src/tools/clippy/rustc_tools_util" } diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 868c74e789..5f0bd72c2d 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 98005f9396..d4daf5e423 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1137,10 +1137,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 988d6bb7ad..c7bef0e89c 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 b79a349a45..6df27bc735 100644 --- a/src/doc/index.md +++ b/src/doc/index.md @@ -77,7 +77,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