summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-0000-ignore-removed-submodules.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/d-0000-ignore-removed-submodules.patch')
-rw-r--r--debian/patches/d-0000-ignore-removed-submodules.patch88
1 files changed, 44 insertions, 44 deletions
diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch
index 2002ea30d..2ca3804d4 100644
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -3,11 +3,11 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100
Subject: d-0000-ignore-removed-submodules
---
- Cargo.toml | 7 -----
- src/bootstrap/bootstrap.py | 4 ---
- src/bootstrap/builder.rs | 54 +++++++++-----------------------------
- src/bootstrap/test.rs | 12 +--------
- src/tools/rust-analyzer/Cargo.toml | 11 +++++++-
+ Cargo.toml | 7 ----
+ src/bootstrap/bootstrap.py | 4 ---
+ src/bootstrap/src/core/build_steps/test.rs | 12 +------
+ src/bootstrap/src/core/builder.rs | 54 +++++++-----------------------
+ src/tools/rust-analyzer/Cargo.toml | 11 +++++-
5 files changed, 24 insertions(+), 64 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,10 +38,10 @@ index 9b11ae8..19a98f9 100644
"src/tools/lld-wrapper",
"src/tools/collect-license-metadata",
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index fac0cdf..6fa1e9e 100644
+index 5a84e37..9bb09a6 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
-@@ -962,10 +962,6 @@ class RustBuild(object):
+@@ -969,10 +969,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))
@@ -52,11 +52,34 @@ index fac0cdf..6fa1e9e 100644
if self.get_toml("metrics", "build"):
args.append("--features")
args.append("build-metrics")
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 46a62ee..216158c 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -499,20 +499,20 @@ impl<'a> ShouldRun<'a> {
+diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
+index d2aa89d..1ea2d93 100644
+--- a/src/bootstrap/src/core/build_steps/test.rs
++++ b/src/bootstrap/src/core/build_steps/test.rs
+@@ -2278,17 +2278,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);
+- let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) {
+- 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 cd27667..2c870e9 100644
+--- a/src/bootstrap/src/core/builder.rs
++++ b/src/bootstrap/src/core/builder.rs
+@@ -498,20 +498,20 @@ impl<'a> ShouldRun<'a> {
static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new();
let init_submodules_paths = |src: &PathBuf| {
@@ -89,7 +112,7 @@ index 46a62ee..216158c 100644
submodules_paths
};
-@@ -686,25 +686,14 @@ impl<'a> Builder<'a> {
+@@ -685,25 +685,14 @@ impl<'a> Builder<'a> {
tool::Linkchecker,
tool::CargoTest,
tool::Compiletest,
@@ -115,7 +138,7 @@ index 46a62ee..216158c 100644
tool::OptimizedDist,
tool::CoverageDump,
),
-@@ -714,12 +703,7 @@ impl<'a> Builder<'a> {
+@@ -713,12 +702,7 @@ impl<'a> Builder<'a> {
check::Rustdoc,
check::CodegenBackend,
check::Clippy,
@@ -128,7 +151,7 @@ index 46a62ee..216158c 100644
check::Bootstrap
),
Kind::Test => describe!(
-@@ -750,7 +734,6 @@ impl<'a> Builder<'a> {
+@@ -751,7 +735,6 @@ impl<'a> Builder<'a> {
test::TierCheck,
test::Cargotest,
test::Cargo,
@@ -136,7 +159,7 @@ index 46a62ee..216158c 100644
test::ErrorIndex,
test::Distcheck,
test::RunMakeFullDeps,
-@@ -766,7 +749,6 @@ impl<'a> Builder<'a> {
+@@ -767,7 +750,6 @@ impl<'a> Builder<'a> {
test::EmbeddedBook,
test::EditionGuide,
test::Rustfmt,
@@ -144,7 +167,7 @@ index 46a62ee..216158c 100644
test::Clippy,
test::RustDemangler,
test::CompiletestTest,
-@@ -803,7 +785,6 @@ impl<'a> Builder<'a> {
+@@ -804,7 +786,6 @@ impl<'a> Builder<'a> {
doc::CargoBook,
doc::Clippy,
doc::ClippyBook,
@@ -152,7 +175,7 @@ index 46a62ee..216158c 100644
doc::EmbeddedBook,
doc::EditionGuide,
doc::StyleGuide,
-@@ -821,12 +802,9 @@ impl<'a> Builder<'a> {
+@@ -823,12 +804,9 @@ impl<'a> Builder<'a> {
dist::Analysis,
dist::Src,
dist::Cargo,
@@ -165,7 +188,7 @@ index 46a62ee..216158c 100644
dist::LlvmTools,
dist::RustDev,
dist::Bootstrap,
-@@ -843,11 +821,9 @@ impl<'a> Builder<'a> {
+@@ -845,11 +823,9 @@ impl<'a> Builder<'a> {
install::Docs,
install::Std,
install::Cargo,
@@ -177,7 +200,7 @@ index 46a62ee..216158c 100644
install::LlvmTools,
install::Src,
install::Rustc
-@@ -857,7 +833,6 @@ impl<'a> Builder<'a> {
+@@ -859,7 +835,6 @@ impl<'a> Builder<'a> {
run::BuildManifest,
run::BumpStage0,
run::ReplaceVersionPlaceholder,
@@ -185,7 +208,7 @@ index 46a62ee..216158c 100644
run::CollectLicenseMetadata,
run::GenerateCopyright,
run::GenerateWindowsSys,
-@@ -1998,10 +1973,7 @@ impl<'a> Builder<'a> {
+@@ -2045,10 +2020,7 @@ impl<'a> Builder<'a> {
}
}
@@ -197,29 +220,6 @@ index 46a62ee..216158c 100644
cargo.arg("--frozen");
}
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index ba030f0..ba2e669 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -2167,17 +2167,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);
-- let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) {
-- ToolState::TestPass
-- } else {
-- ToolState::TestFail
-- };
-- builder.save_toolstate("rustc-dev-guide", toolstate);
-+ builder.save_toolstate("rustc-dev-guide", ToolState::TestPass);
- }
- }
-
diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
index cab88fc..5bac437 100644
--- a/src/tools/rust-analyzer/Cargo.toml
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 14:13:13 +0000