From 5b6ab22d11f9f27b9105f0dc1d260ff0a12b27e5 Mon Sep 17 00:00:00 2001 From: Rust Maintainers Date: Sat, 19 May 2018 21:10:33 +0100 Subject: [PATCH] d-ignore-removed-submodules Gbp-Pq: Name d-ignore-removed-submodules.patch --- src/Cargo.toml | 34 ---------------------------------- 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(+), 44 deletions(-) diff --git a/src/Cargo.toml b/src/Cargo.toml index c03301852c..e808ab5a12 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, compiletest will segfault if compiled with opt-level=3 on 64-bit @@ -57,18 +38,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" } diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 454b414cea..a69f6d938c 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -615,10 +615,6 @@ class RustBuild(object): args.append("--verbose") if self.verbose > 1: 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 fcb78c479f..5ab0ea6086 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -783,10 +783,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 2a6fa2ad13..8a0a49420e 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -141,7 +141,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 3add277410..1df6d3bbca 100644 --- a/src/doc/index.md +++ b/src/doc/index.md @@ -56,5 +56,5 @@ before this policy was put into place. That work is being tracked [nomicon]: nomicon/index.html [unstable-book]: unstable-book/index.html [rustdoc-book]: rustdoc/index.html -[cargo-book]: cargo/index.html +[cargo-book]: ../../cargo-doc/doc/index.html -- 2.30.2