From f1ec7f87f20c3a9af3322aadc946f120f207c4c3 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Sun, 5 Aug 2018 10:18:10 +0100 Subject: [PATCH] d-ignore-removed-submodules Gbp-Pq: Name d-ignore-removed-submodules.patch --- src/Cargo.toml | 32 -------------------------------- 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(+), 42 deletions(-) diff --git a/src/Cargo.toml b/src/Cargo.toml index 47fbe779c5..a75cc408d2 100644 --- a/src/Cargo.toml +++ b/src/Cargo.toml @@ -17,27 +17,8 @@ members = [ "tools/remote-test-client", "tools/remote-test-server", "tools/rust-installer", - "tools/cargo", "tools/rustdoc", - "tools/rls", - "tools/rustfmt", - "tools/miri", "tools/rustdoc-themes", - # FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude - "tools/rls/test_data/bin_lib", - "tools/rls/test_data/borrow_error", - "tools/rls/test_data/common", - "tools/rls/test_data/deglob", - "tools/rls/test_data/features", - "tools/rls/test_data/find_all_refs_no_cfg_test", - "tools/rls/test_data/find_impls", - "tools/rls/test_data/infer_bin", - "tools/rls/test_data/infer_custom_bin", - "tools/rls/test_data/infer_lib", - "tools/rls/test_data/multiple_bins", - "tools/rls/test_data/reformat", - "tools/rls/test_data/reformat_with_range", - "tools/rls/test_data/workspace_symbol", ] # Curiously, libtest will segfault if compiled with opt-level=3 @@ -56,16 +37,3 @@ 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."https://github.com/rust-lang-nursery/rustfmt"] -# 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 vesion). -rustfmt-nightly = { path = "tools/rustfmt" } diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index cc2f5ab037..2007e2e498 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -627,10 +627,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 ec7eebd1d0..f485c3c411 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1032,10 +1032,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 c3c8bf821c..3085562272 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -144,7 +144,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 3a4f51069f..9feab94c69 100644 --- a/src/doc/index.md +++ b/src/doc/index.md @@ -49,7 +49,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