From 145a12b67e8f12ef81bbe53621aa84e1de817d3c 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 Description: remove upstream parts that are not needed for the Debian build, in order to both reduce the orig tarball and the vendored crates within. Forwarded: not-needed Gbp-Pq: Topic prune Gbp-Pq: Name d-0000-ignore-removed-submodules.patch --- Cargo.toml | 6 ----- src/bootstrap/bootstrap.py | 4 --- src/bootstrap/src/core/build_steps/test.rs | 13 +-------- src/bootstrap/src/core/builder.rs | 31 +--------------------- src/tools/build_helper/src/util.rs | 21 +-------------- src/tools/rust-analyzer/Cargo.toml | 11 +++++++- 6 files changed, 13 insertions(+), 73 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ce87a8c20b..1751db1438 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,21 +20,15 @@ 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/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/jsondocck", "src/tools/jsondoclint", "src/tools/llvm-bitcode-linker", "src/tools/html-checker", - "src/tools/bump-stage0", "src/tools/replace-version-placeholder", "src/tools/lld-wrapper", "src/tools/collect-license-metadata", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 4e8e0fd253..7a4790ddd9 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1007,10 +1007,6 @@ class RustBuild(object): args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] args.extend("--verbose" for _ in range(self.verbose)) - if self.use_locked_deps: - args.append("--locked") - if self.use_vendored_sources: - args.append("--frozen") if self.get_toml("metrics", "build"): args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs index 3f0cbde64e..33b68e0abb 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs @@ -2398,18 +2398,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).delay_failure(); - rustbook_cmd.arg("linkcheck").arg(&src); - let toolstate = if rustbook_cmd.run(builder).is_success() { - ToolState::TestPass - } else { - ToolState::TestFail - }; - builder.save_toolstate("rustc-dev-guide", toolstate); + builder.save_toolstate("rustc-dev-guide", ToolState::TestPass); } } diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs index 6d6df650b1..0cd0e2d964 100644 --- a/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs @@ -778,24 +778,13 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, - tool::RemoteTestServer, - tool::RemoteTestClient, tool::RustInstaller, tool::Cargo, - tool::Rls, - tool::RustAnalyzer, tool::RustAnalyzerProcMacroSrv, tool::Rustdoc, tool::Clippy, tool::CargoClippy, - llvm::Llvm, - llvm::Sanitizers, tool::Rustfmt, - tool::Miri, - tool::CargoMiri, - llvm::Lld, - llvm::CrtBeginEnd, - tool::RustdocGUITest, tool::OptimizedDist, tool::CoverageDump, tool::LlvmBitcodeLinker, @@ -834,12 +823,7 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, - check::Miri, - check::CargoMiri, - check::MiroptTestTools, - check::Rls, check::Rustfmt, - check::RustAnalyzer, check::Bootstrap, ), Kind::Test => describe!( @@ -872,7 +856,6 @@ impl<'a> Builder<'a> { test::TierCheck, test::Cargotest, test::Cargo, - test::RustAnalyzer, test::ErrorIndex, test::Distcheck, test::Nomicon, @@ -887,8 +870,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, - test::Miri, - test::CargoMiri, test::Clippy, test::CompiletestTest, test::CrateRunMakeSupport, @@ -927,7 +908,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, - doc::Miri, doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, @@ -948,11 +928,8 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, - dist::Rls, - dist::RustAnalyzer, dist::Rustfmt, dist::Clippy, - dist::Miri, dist::LlvmTools, dist::LlvmBitcodeLinker, dist::RustDev, @@ -975,10 +952,8 @@ impl<'a> Builder<'a> { // install the same binaries twice for each tool, leaving backup files (*.old) as a result. install::Rustc, install::Cargo, - install::RustAnalyzer, install::Rustfmt, install::Clippy, - install::Miri, install::LlvmTools, install::Src, ), @@ -986,7 +961,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, - run::Miri, run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, @@ -2131,10 +2105,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/tools/build_helper/src/util.rs b/src/tools/build_helper/src/util.rs index 72c05c4c48..3be35b7dd8 100644 --- a/src/tools/build_helper/src/util.rs +++ b/src/tools/build_helper/src/util.rs @@ -52,24 +52,5 @@ pub fn try_run(cmd: &mut Command, print_cmd_on_fail: bool) -> Result<(), ()> { /// Returns the submodule paths from the `.gitmodules` file in the given directory. pub fn parse_gitmodules(target_dir: &Path) -> &[String] { - static SUBMODULES_PATHS: OnceLock> = OnceLock::new(); - let gitmodules = target_dir.join(".gitmodules"); - assert!(gitmodules.exists(), "'{}' file is missing.", gitmodules.display()); - - let init_submodules_paths = || { - let file = File::open(gitmodules).unwrap(); - - let mut submodules_paths = vec![]; - for line in BufReader::new(file).lines().map_while(Result::ok) { - let line = line.trim(); - if line.starts_with("path") { - let actual_path = line.split(' ').last().expect("Couldn't get value of path"); - submodules_paths.push(actual_path.to_owned()); - } - } - - submodules_paths - }; - - SUBMODULES_PATHS.get_or_init(|| init_submodules_paths()) + return &[]; } diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml index d4c3b7a3bf..1ed6f261f7 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -1,5 +1,14 @@ [workspace] -members = ["xtask/", "lib/*", "crates/*"] +members = [ + "xtask/", + "lib/*", + "crates/proc-macro-srv", + "crates/proc-macro-srv-cli", + "crates/tt", + "crates/mbe", + "crates/paths", + "crates/proc-macro-api", +] exclude = ["crates/proc-macro-srv/proc-macro-test/imp"] resolver = "2" -- 2.30.2