Fix bootstrap with self version

diff --git a/debian/changelog b/debian/changelog
index c30a44cda1f247c64326032fc00a3417774ccfe1..01436f85582df87c2d9587bfd4bece529f08093d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rustc (1.51.0+dfsg1-1~exp2) UNRELEASED; urgency=medium
 
   * Drop patch fixed upstream.
+  * Fix bootstrap with self version.
 
  -- Ximin Luo <infinity0@debian.org>  Thu, 15 Apr 2021 16:43:50 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
index 891210d88cec8d0d42afb66f592edaeee6501fe6..e17140d5edd611613619a86a864fbbbc9c0147af 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 # Patches for upstream
 
 # pending, or forwarded
+u-fix-self-bootstrap.patch
 0001-Revert-Auto-merge-of-79547.patch
 u-84099.patch
 u-8d504aa90416668d8f6b4cbd449e2e1de20fb937.patch

diff --git a/debian/patches/u-fix-self-bootstrap.patch b/debian/patches/u-fix-self-bootstrap.patch
new file mode 100644 (file)
index 0000000..3a0caa4
--- /dev/null
+++ b/debian/patches/u-fix-self-bootstrap.patch
@@ -0,0 +1,11 @@
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -1490,7 +1490,7 @@
+                 for el in stack.iter().rev() {
+                     out += &format!("\t{:?}\n", el);
+                 }
+-                panic!(out);
++                panic!("{}", out);
+             }
+             if let Some(out) = self.cache.get(&step) {
+                 self.verbose(&format!("{}c {:?}", "  ".repeat(stack.len()), step));