d-ignore-removed-submodules

Gbp-Pq: Name d-ignore-removed-submodules.patch

diff --git a/src/Cargo.toml b/src/Cargo.toml
index 47fbe779c5d3e8ebf8fe1cc928e36f882ceafc4d..a75cc408d2a604c37f97aebbaaf20a7c13fb1918 100644 (file)
--- 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 cc2f5ab0379ce038e4511fd776a8c1b44e12a99a..2007e2e498776c141236e4e6752ed493c2d6d473 100644 (file)
--- 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 ec7eebd1d0189508364b331e15c817029f969719..f485c3c411c47d468fa7acf4aa64e8133f0034b6 100644 (file)
--- 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 c3c8bf821cd6a57ceb1c80ce16393b3f9f9813a9..308556227224f0a4038f6b4ff9294e602509060c 100644 (file)
--- 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 3a4f51069fc3b7f1534b7a5505633f5cfc04f90f..9feab94c69622edaaf24b11fd5ffb7f0d5ee7cc7 100644 (file)
--- 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