From 352118fbe0d8241c8b56a8b3a39e6ddf01532b1a Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: [PATCH] d-0000-ignore-removed-submodules Gbp-Pq: Name d-0000-ignore-removed-submodules.patch --- Cargo.toml | 27 --------------------------- src/bootstrap/bootstrap.py | 4 ---- src/bootstrap/builder.rs | 7 +------ src/bootstrap/doc.rs | 1 - src/bootstrap/test.rs | 12 +----------- src/tools/clippy/Cargo.toml | 5 ----- src/tools/rustfmt/Cargo.toml | 5 ----- src/tools/tidy/src/deps.rs | 4 ++-- 8 files changed, 4 insertions(+), 61 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cae48d795..6ab0782bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,25 +17,14 @@ members = [ "src/tools/tidy", "src/tools/tier-check", "src/tools/build-manifest", - "src/tools/remote-test-client", - "src/tools/remote-test-server", "src/tools/rust-installer", "src/tools/rust-demangler", - "src/tools/cargo", - "src/tools/cargo/crates/credential/cargo-credential-1password", - "src/tools/cargo/crates/credential/cargo-credential-macos-keychain", - "src/tools/cargo/crates/credential/cargo-credential-wincred", "src/tools/rustdoc", - "src/tools/rls", "src/tools/rustfmt", - "src/tools/miri", - "src/tools/miri/cargo-miri", "src/tools/rustdoc-themes", "src/tools/unicode-table-generator", - "src/tools/expand-yaml-anchors", "src/tools/jsondocck", "src/tools/html-checker", - "src/tools/bump-stage0", "src/tools/lld-wrapper", ] @@ -105,25 +94,9 @@ debug = 0 # Only use debuginfo=1 to further reduce compile times. bootstrap.debug = 1 -# 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" } cargo-util = { path = "src/tools/cargo/crates/cargo-util" } -[patch."https://github.com/rust-lang/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 version). -rustfmt-nightly = { path = "src/tools/rustfmt" } - [patch.crates-io] -# 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' } # See comments in `library/rustc-std-workspace-core/README.md` for what's going on # here diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index f6fd534bb..8eabae487 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -982,10 +982,6 @@ class RustBuild(object): os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] for _ in range(0, 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 6ba1b1b60..edd5bf1b5 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -481,7 +481,6 @@ impl<'a> Builder<'a> { doc::RustdocBook, doc::RustByExample, doc::RustcBook, - doc::CargoBook, doc::Clippy, doc::EmbeddedBook, doc::EditionGuide, @@ -506,7 +505,6 @@ impl<'a> Builder<'a> { dist::Miri, dist::LlvmTools, dist::RustDev, - dist::Extended, dist::BuildManifest, dist::ReproducibleArtifacts, ), @@ -1522,10 +1520,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 f0f31c447..01d9b8478 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -76,7 +76,6 @@ macro_rules! book { // FIXME: Make checking for a submodule automatic somehow (maybe by having a list of all submodules // and checking against it?). book!( - CargoBook, "src/tools/cargo/src/doc", "cargo", submodule = "src/tools/cargo"; EditionGuide, "src/doc/edition-guide", "edition-guide", submodule; EmbeddedBook, "src/doc/embedded-book", "embedded-book", submodule; Nomicon, "src/doc/nomicon", "nomicon", submodule; diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index cb1b0ebf8..74af81dac 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1833,17 +1833,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { - let relative_path = Path::new("src").join("doc").join("rustc-dev-guide"); - builder.update_submodule(&relative_path); - - let src = builder.src.join(relative_path); - let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); - let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) { - ToolState::TestPass - } else { - ToolState::TestFail - }; - builder.save_toolstate("rustc-dev-guide", toolstate); + builder.save_toolstate("rustc-dev-guide", ToolState::TestPass); } } diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml index 602877bb9..295d1a085 100644 --- a/src/tools/clippy/Cargo.toml +++ b/src/tools/clippy/Cargo.toml @@ -34,11 +34,6 @@ regex = "1.5" # This is used by the `collect-metadata` alias. filetime = "0.2" -# A noop dependency that changes in the Rust repository, it's a bit of a hack. -# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust` -# for more information. -rustc-workspace-hack = "1.0" - # UI test dependencies clippy_utils = { path = "clippy_utils" } derive-new = "0.5" diff --git a/src/tools/rustfmt/Cargo.toml b/src/tools/rustfmt/Cargo.toml index 8d9c4a7fb..f92b1dc0c 100644 --- a/src/tools/rustfmt/Cargo.toml +++ b/src/tools/rustfmt/Cargo.toml @@ -58,9 +58,4 @@ lazy_static = "1.0.0" anyhow = "1.0" thiserror = "1.0" -# A noop dependency that changes in the Rust repository, it's a bit of a hack. -# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust` -# for more information. -rustc-workspace-hack = "1.0.0" - # Rustc dependencies are loaded from the sysroot, Cargo doesn't know about them. diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index bc33284f3..8d956dbe9 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -272,8 +272,8 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[ // These two crates take quite a long time to build, so don't allow two versions of them // to accidentally sneak into our dependency graph, in order to ensure we keep our CI times // under control. - "cargo", - "rustc-ap-rustc_ast", + //"cargo", + //"rustc-ap-rustc_ast", ]; /// Dependency checks. -- 2.30.2