d-ignore-removed-submodules

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

diff --git a/src/Cargo.toml b/src/Cargo.toml
index 35858ee286838c5b8d7563e2fb295e29036322be..ee32e95f257f9018d17400bf45d9f6e6658e2c49 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",
 ]
 
 # These options are controlled from our rustc wrapper script, so turn them off
@@ -49,19 +30,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.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 vesion). Unlike Cargo, however, the
-# RLS depends on `rustfmt` from crates.io, so we put this in a `[patch]` section
-# for crates.io
-rustfmt-nightly = { path = "tools/rustfmt" }
-clippy_lints = { path = "tools/clippy/clippy_lints" }

diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 1e756b6207f29c6ba0648e27c87a94f70b5985c9..3e7c2b9a040f554533863a62bb2061a49331f156 100644 (file)
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -600,10 +600,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 44d7b94fc0bf4a93e2f3a749f583530e26f2c733..f0231218da3737914ce3465343f16825cffa1d15 100644 (file)
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -845,10 +845,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 3dd9a66ac36c872eed4872c268fa6c0b47bc38f7..4d120ee35d98a22f6bdf9b05185adfe740c7eff7 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