diff options
Diffstat (limited to 'debian/patches/d-0000-ignore-removed-submodules.patch')
| -rw-r--r-- | debian/patches/d-0000-ignore-removed-submodules.patch | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index 7fdae2bd9..5ce806e79 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -5,20 +5,20 @@ Subject: d-0000-ignore-removed-submodules --- Cargo.toml | 15 --------------- src/bootstrap/bootstrap.py | 4 ---- - src/bootstrap/builder.rs | 15 +-------------- + src/bootstrap/builder.rs | 17 +---------------- src/bootstrap/doc.rs | 1 - src/bootstrap/test.rs | 12 +----------- src/tools/clippy/Cargo.toml | 5 ----- src/tools/rust-analyzer/Cargo.toml | 11 ++++++++++- src/tools/rustfmt/Cargo.toml | 5 ----- src/tools/tidy/src/deps.rs | 2 +- - 9 files changed, 13 insertions(+), 57 deletions(-) + 9 files changed, 13 insertions(+), 59 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index e49fe5e..863c800 100644 +index 000c10a..7442a0e 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -16,27 +16,15 @@ members = [ +@@ -17,27 +17,15 @@ members = [ "src/tools/tidy", "src/tools/tier-check", "src/tools/build-manifest", @@ -44,9 +44,9 @@ index e49fe5e..863c800 100644 - "src/tools/bump-stage0", - "src/tools/replace-version-placeholder", "src/tools/lld-wrapper", - ] - -@@ -99,9 +87,6 @@ miniz_oxide.debug = 0 + "src/tools/collect-license-metadata", + "src/tools/generate-copyright", +@@ -102,9 +90,6 @@ miniz_oxide.debug = 0 object.debug = 0 [patch.crates-io] @@ -57,10 +57,10 @@ index e49fe5e..863c800 100644 # 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 5712868..5a6ab27 100644 +index 2d5018d..cc2ae13 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -766,10 +766,6 @@ class RustBuild(object): +@@ -767,10 +767,6 @@ class RustBuild(object): os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] for _ in range(0, self.verbose): args.append("--verbose") @@ -72,10 +72,10 @@ index 5712868..5a6ab27 100644 args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 8b144f1..c4bed1ec 100644 +index 8ee6d49..8bc92c8 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -599,8 +599,6 @@ impl<'a> Builder<'a> { +@@ -596,8 +596,6 @@ impl<'a> Builder<'a> { tool::RemoteTestClient, tool::RustInstaller, tool::Cargo, @@ -84,16 +84,18 @@ index 8b144f1..c4bed1ec 100644 tool::RustAnalyzerProcMacroSrv, tool::RustDemangler, tool::Rustdoc, -@@ -621,8 +619,6 @@ impl<'a> Builder<'a> { +@@ -618,10 +616,6 @@ impl<'a> Builder<'a> { check::CodegenBackend, check::Clippy, check::Miri, +- check::CargoMiri, +- check::MiroptTestTools, - check::Rls, - check::RustAnalyzer, check::Rustfmt, check::Bootstrap ), -@@ -650,7 +646,6 @@ impl<'a> Builder<'a> { +@@ -650,7 +644,6 @@ impl<'a> Builder<'a> { test::ReplacePlaceholderTest, test::Cargotest, test::Cargo, @@ -101,7 +103,7 @@ index 8b144f1..c4bed1ec 100644 test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -698,10 +693,8 @@ impl<'a> Builder<'a> { +@@ -698,10 +691,8 @@ impl<'a> Builder<'a> { doc::RustdocBook, doc::RustByExample, doc::RustcBook, @@ -112,7 +114,7 @@ index 8b144f1..c4bed1ec 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -717,8 +710,6 @@ impl<'a> Builder<'a> { +@@ -717,8 +708,6 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -121,7 +123,7 @@ index 8b144f1..c4bed1ec 100644 dist::Rustfmt, dist::RustDemangler, dist::Clippy, -@@ -739,7 +730,6 @@ impl<'a> Builder<'a> { +@@ -739,7 +728,6 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -129,7 +131,7 @@ index 8b144f1..c4bed1ec 100644 install::Rustfmt, install::RustDemangler, install::Clippy, -@@ -2062,10 +2052,7 @@ impl<'a> Builder<'a> { +@@ -1823,10 +1811,7 @@ impl<'a> Builder<'a> { } } @@ -142,7 +144,7 @@ index 8b144f1..c4bed1ec 100644 } diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs -index ea06caf..5d8247f 100644 +index 2c6fd1e..52c3eba 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -74,7 +74,6 @@ macro_rules! book { @@ -154,10 +156,10 @@ index ea06caf..5d8247f 100644 EditionGuide, "src/doc/edition-guide", "edition-guide", submodule; EmbeddedBook, "src/doc/embedded-book", "embedded-book", submodule; diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index 791c35c..964e2e0 100644 +index 39cedfd..7ed7d97 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs -@@ -1909,17 +1909,7 @@ impl Step for RustcGuide { +@@ -1975,17 +1975,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -177,7 +179,7 @@ index 791c35c..964e2e0 100644 } diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml -index 60200a8..3980db9 100644 +index fe425a2..23beb15 100644 --- a/src/tools/clippy/Cargo.toml +++ b/src/tools/clippy/Cargo.toml @@ -36,11 +36,6 @@ walkdir = "2.3" @@ -229,10 +231,10 @@ index 7a4e02d..27b91f2 100644 [package.metadata.rust-analyzer] diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs -index 8a0239e..9b35cba 100644 +index 296db9d..0369861 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs -@@ -311,7 +311,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[ +@@ -333,7 +333,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[ // This crate takes 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. @@ -241,3 +243,12 @@ index 8a0239e..9b35cba 100644 ]; /// Dependency checks. +@@ -629,6 +629,8 @@ + } + + fn check_rustfix(metadata: &Metadata, bad: &mut bool) { ++ // Debian: we don't build cargo here, so this function doens't function. ++ return; + let cargo = pkg_from_name(metadata, "cargo"); + let compiletest = pkg_from_name(metadata, "compiletest"); + let cargo_deps = deps_of(metadata, &cargo.id); |