From 85c00e9cdde9833b5ca68cbbe931c232e2798f15 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Sun, 5 Jan 2020 13:35:46 +0000 Subject: [PATCH] d-0000-ignore-removed-submodules Gbp-Pq: Name d-0000-ignore-removed-submodules.patch --- Cargo.toml | 26 -------------------------- src/bootstrap/bootstrap.py | 4 ---- src/bootstrap/builder.rs | 7 +------ src/bootstrap/doc.rs | 2 +- src/bootstrap/test.rs | 16 ++++++++-------- src/bootstrap/tool.rs | 4 ++-- src/doc/index.md | 2 +- src/tools/rustbook/Cargo.toml | 5 ----- src/tools/tidy/src/deps.rs | 4 ++-- 9 files changed, 15 insertions(+), 55 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a242f090fb..3cfadf9428 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 = [ @@ -46,29 +39,10 @@ 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' } # See comments in `tools/rustc-std-workspace-core/README.md` for what's going on # here rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' } rustc-std-workspace-alloc = { path = 'src/tools/rustc-std-workspace-alloc' } rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' } - -[patch."https://github.com/rust-lang/rust-clippy"] -clippy_lints = { path = "src/tools/clippy/clippy_lints" } diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index d2a0f107a2..d7eb57a2c3 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -656,10 +656,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 2edcef203a..a7f819e5f0 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -454,8 +454,6 @@ impl<'a> Builder<'a> { dist::Miri, dist::LlvmTools, dist::Lldb, - dist::Extended, - dist::HashSign ), Kind::Install => describe!( install::Docs, @@ -1235,10 +1233,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 331fc3acd9..f0076dbbae 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -113,7 +113,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/bootstrap/test.rs b/src/bootstrap/test.rs index 60f0dccdb0..3ab36cbe94 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1585,14 +1585,14 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { - let src = builder.src.join("src/doc/rustc-guide"); - 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-guide", toolstate); + //let src = builder.src.join("src/doc/rustc-guide"); + //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-guide", ToolState::TestPass); } } diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 815498047f..bad3acb899 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -277,14 +277,14 @@ pub fn prepare_tool_cargo( } fn rustbook_features() -> Vec { - let mut features = Vec::new(); + let features = Vec::new(); // Due to CI budged and risk of spurious failures we want to limit jobs running this check. // At same time local builds should run it regardless of the platform. // `CiEnv::None` means it's local build and `CHECK_LINKS` is defined in x86_64-gnu-tools to // explicitly enable it on single job if CiEnv::current() == CiEnv::None || env::var("CHECK_LINKS").is_ok() { - features.push("linkcheck".to_string()); + // features.push("linkcheck".to_string()); } features diff --git a/src/doc/index.md b/src/doc/index.md index 0a2a80e8fd..5861a0d186 100644 --- a/src/doc/index.md +++ b/src/doc/index.md @@ -87,7 +87,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 diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml index 67da04dd67..8fa91d924c 100644 --- a/src/tools/rustbook/Cargo.toml +++ b/src/tools/rustbook/Cargo.toml @@ -12,11 +12,6 @@ linkcheck = [] clap = "2.25.0" failure = "0.1" -# 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" - [dependencies.mdbook] version = "0.3.5" default-features = false diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index e6ea1c75e2..df9aace424 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -404,8 +404,8 @@ fn check_crate_duplicate(resolve: &Resolve, bad: &mut bool) { // to accidentally sneak into our dependency graph, in order to ensure we keep our CI times // under control. - "cargo", - "rustc-ap-syntax", + //"cargo", + //"rustc-ap-syntax", ]; let mut name_to_id: HashMap<_, Vec<_>> = HashMap::new(); for node in resolve.nodes.iter() { -- 2.30.2