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, 30 insertions, 27 deletions
diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index 5ce806e79..6c3b0cfad 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -3,22 +3,22 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: d-0000-ignore-removed-submodules --- - Cargo.toml | 15 --------------- + Cargo.toml | 17 ----------------- src/bootstrap/bootstrap.py | 4 ---- - src/bootstrap/builder.rs | 17 +---------------- + src/bootstrap/builder.rs | 18 +----------------- 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(+), 59 deletions(-) + src/tools/tidy/src/deps.rs | 4 +++- + 9 files changed, 15 insertions(+), 62 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 000c10a..7442a0e 100644 +index 15cbb26..c012319 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -17,27 +17,15 @@ members = [ +@@ -18,29 +18,15 @@ members = [ "src/tools/tidy", "src/tools/tier-check", "src/tools/build-manifest", @@ -30,6 +30,8 @@ index 000c10a..7442a0e 100644 - "src/tools/cargo/crates/credential/cargo-credential-1password", - "src/tools/cargo/crates/credential/cargo-credential-macos-keychain", - "src/tools/cargo/crates/credential/cargo-credential-wincred", +- "src/tools/cargo/crates/mdman", +- # "src/tools/cargo/crates/resolver-tests", "src/tools/rustdoc", - "src/tools/rls", "src/tools/rustfmt", @@ -46,7 +48,7 @@ index 000c10a..7442a0e 100644 "src/tools/lld-wrapper", "src/tools/collect-license-metadata", "src/tools/generate-copyright", -@@ -102,9 +90,6 @@ miniz_oxide.debug = 0 +@@ -105,9 +91,6 @@ miniz_oxide.debug = 0 object.debug = 0 [patch.crates-io] @@ -57,10 +59,10 @@ index 000c10a..7442a0e 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 2d5018d..cc2ae13 100644 +index 9cf43fc..39b985f 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -767,10 +767,6 @@ class RustBuild(object): +@@ -770,10 +770,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 +74,10 @@ index 2d5018d..cc2ae13 100644 args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 8ee6d49..8bc92c8 100644 +index b4fc1d4..2bb0659 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -596,8 +596,6 @@ impl<'a> Builder<'a> { +@@ -629,8 +629,6 @@ impl<'a> Builder<'a> { tool::RemoteTestClient, tool::RustInstaller, tool::Cargo, @@ -84,7 +86,7 @@ index 8ee6d49..8bc92c8 100644 tool::RustAnalyzerProcMacroSrv, tool::RustDemangler, tool::Rustdoc, -@@ -618,10 +616,6 @@ impl<'a> Builder<'a> { +@@ -651,10 +649,6 @@ impl<'a> Builder<'a> { check::CodegenBackend, check::Clippy, check::Miri, @@ -95,7 +97,7 @@ index 8ee6d49..8bc92c8 100644 check::Rustfmt, check::Bootstrap ), -@@ -650,7 +644,6 @@ impl<'a> Builder<'a> { +@@ -684,7 +678,6 @@ impl<'a> Builder<'a> { test::ReplacePlaceholderTest, test::Cargotest, test::Cargo, @@ -103,10 +105,11 @@ index 8ee6d49..8bc92c8 100644 test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -698,10 +691,8 @@ impl<'a> Builder<'a> { +@@ -732,11 +725,8 @@ impl<'a> Builder<'a> { doc::RustdocBook, doc::RustByExample, doc::RustcBook, +- doc::Cargo, - doc::CargoBook, doc::Clippy, doc::ClippyBook, @@ -114,7 +117,7 @@ index 8ee6d49..8bc92c8 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -717,8 +708,6 @@ impl<'a> Builder<'a> { +@@ -752,8 +742,6 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -123,7 +126,7 @@ index 8ee6d49..8bc92c8 100644 dist::Rustfmt, dist::RustDemangler, dist::Clippy, -@@ -739,7 +728,6 @@ impl<'a> Builder<'a> { +@@ -774,7 +762,6 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -131,7 +134,7 @@ index 8ee6d49..8bc92c8 100644 install::Rustfmt, install::RustDemangler, install::Clippy, -@@ -1823,10 +1811,7 @@ impl<'a> Builder<'a> { +@@ -1889,10 +1876,7 @@ impl<'a> Builder<'a> { } } @@ -144,10 +147,10 @@ index 8ee6d49..8bc92c8 100644 } diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs -index 2c6fd1e..52c3eba 100644 +index 9bad904..d02edb0 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs -@@ -74,7 +74,6 @@ macro_rules! book { +@@ -75,7 +75,6 @@ macro_rules! book { // FIXME: Make checking for a submodule automatic somehow (maybe by having a list of all submodules // and checking against it?). book!( @@ -156,10 +159,10 @@ index 2c6fd1e..52c3eba 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 39cedfd..7ed7d97 100644 +index 6078e39..1a385f5 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs -@@ -1975,17 +1975,7 @@ impl Step for RustcGuide { +@@ -2005,17 +2005,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -179,7 +182,7 @@ index 39cedfd..7ed7d97 100644 } diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml -index fe425a2..23beb15 100644 +index f8cb4b7..3aa9ec6 100644 --- a/src/tools/clippy/Cargo.toml +++ b/src/tools/clippy/Cargo.toml @@ -36,11 +36,6 @@ walkdir = "2.3" @@ -231,10 +234,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 296db9d..0369861 100644 +index bc2edf6..142c2e9 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs -@@ -333,7 +333,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[ +@@ -332,7 +332,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. @@ -243,12 +246,12 @@ index 296db9d..0369861 100644 ]; /// Dependency checks. -@@ -629,6 +629,8 @@ +@@ -608,6 +608,8 @@ fn direct_deps_of<'a>(metadata: &'a Metadata, pkg_id: &'a PackageId) -> Vec<&'a } - + 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); + let cargo_deps = direct_deps_of(metadata, &cargo.id); |