From: Debian Rust Maintainers Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: 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 --- Cargo.toml | 6 ------ src/bootstrap/bootstrap.py | 4 ---- src/bootstrap/src/core/build_steps/vendor.rs | 5 ----- src/bootstrap/src/core/builder/cargo.rs | 5 +---- src/bootstrap/src/core/builder/mod.rs | 23 ----------------------- src/build_helper/src/util.rs | 21 +-------------------- 6 files changed, 2 insertions(+), 62 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 97e782d..3dfb5a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,21 +21,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 01a9792..84a2aa3 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1133,10 +1133,6 @@ class RustBuild(object): if "BOOTSTRAP_TRACING" in env: args.append("--features=tracing") - 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/vendor.rs b/src/bootstrap/src/core/build_steps/vendor.rs index 410dbc0..6c0eba1 100644 --- a/src/bootstrap/src/core/build_steps/vendor.rs +++ b/src/bootstrap/src/core/build_steps/vendor.rs @@ -15,14 +15,9 @@ pub fn default_paths_to_vendor(builder: &Builder<'_>) -> Vec<(PathBuf, Vec<&'sta [ ("src/tools/cargo/Cargo.toml", vec!["src/tools/cargo"]), ("src/tools/rust-analyzer/Cargo.toml", vec![]), - ("compiler/rustc_codegen_cranelift/Cargo.toml", vec![]), - ("compiler/rustc_codegen_gcc/Cargo.toml", vec![]), ("library/Cargo.toml", vec![]), ("src/bootstrap/Cargo.toml", vec![]), ("src/tools/rustbook/Cargo.toml", SUBMODULES_FOR_RUSTBOOK.into()), - ("src/tools/rustc-perf/Cargo.toml", vec!["src/tools/rustc-perf"]), - ("src/tools/opt-dist/Cargo.toml", vec![]), - ("src/doc/book/packages/trpl/Cargo.toml", vec![]), ] .into_iter() .map(|(path, submodules)| (builder.src.join(path), submodules)) diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs index 1ec3e60..95b8504 100644 --- a/src/bootstrap/src/core/builder/cargo.rs +++ b/src/bootstrap/src/core/builder/cargo.rs @@ -1176,10 +1176,7 @@ impl Builder<'_> { } } - 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/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index ecec589..c518f7b 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -870,26 +870,14 @@ 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, - gcc::Gcc, - llvm::Sanitizers, tool::Rustfmt, - tool::Miri, - tool::CargoMiri, - llvm::Lld, - llvm::Enzyme, - llvm::CrtBeginEnd, - tool::RustdocGUITest, tool::OptimizedDist, tool::CoverageDump, tool::LlvmBitcodeLinker, @@ -931,10 +919,6 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, - check::Miri, - check::CargoMiri, - check::MiroptTestTools, - check::Rls, check::Rustfmt, check::RustAnalyzer, check::TestFloatParse, @@ -984,8 +968,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, - test::Miri, - test::CargoMiri, test::Clippy, test::CompiletestTest, test::CrateRunMakeSupport, @@ -1026,7 +1008,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, - doc::Miri, doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, @@ -1049,11 +1030,9 @@ 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, @@ -1079,7 +1058,6 @@ impl<'a> Builder<'a> { install::RustAnalyzer, install::Rustfmt, install::Clippy, - install::Miri, install::LlvmTools, install::Src, ), @@ -1087,7 +1065,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, - run::Miri, run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, diff --git a/src/build_helper/src/util.rs b/src/build_helper/src/util.rs index 72c05c4..3be35b7 100644 --- a/src/build_helper/src/util.rs +++ b/src/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 &[]; }