+rustc (1.55.0+dfsg1-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org> Fri, 08 Oct 2021 13:55:58 +0100
+
rustc (1.54.0+dfsg1-2) unstable; urgency=medium
* Fix some more build & test failures.
dpkg-dev (>= 1.17.14),
python3:native,
cargo:native (>= 0.40.0) <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.53.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.54.0++) <!pkg.rustc.dlstage0>,
+ rustc:native (>= 1.54.0+dfsg) <!pkg.rustc.dlstage0>,
+ rustc:native (<= 1.55.0++) <!pkg.rustc.dlstage0>,
llvm-12-dev:native,
llvm-12-tools:native,
gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
libstd-rust-dev (= ${binary:Version}),
gcc, libc-dev, binutils (>= 2.26)
Recommends:
- cargo (>= 0.55.0~~), cargo (<< 0.56.0~~),
+ cargo (>= 0.56.0~~), cargo (<< 0.57.0~~),
# llvm is needed for llvm-dwp for -C split-debuginfo=packed
llvm-12,
Suggests:
generic programming and meta-programming, in both static and dynamic
styles.
-Package: libstd-rust-1.54
+Package: libstd-rust-1.55
Section: libs
Architecture: any
Multi-Arch: same
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-1.54 (= ${binary:Version}),
+ libstd-rust-1.55 (= ${binary:Version}),
Description: Rust standard libraries - development files
Rust is a curly-brace, block-structured expression language. It
visually resembles the C language family, but differs significantly
Architecture: any
Multi-Arch: allowed
Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.54 (= ${binary:Version})
+ libstd-rust-1.55 (= ${binary:Version})
Recommends: cargo
Description: Rust linter
Rust is a curly-brace, block-structured expression language. It
rust-gdb (>= ${binary:Version}) | rust-lldb (>= ${binary:Version}),
cargo,
Recommends:
- cargo (>= 0.55.0~~), cargo (<< 0.56.0~~)
+ cargo (>= 0.56.0~~), cargo (<< 0.57.0~~)
Suggests:
rust-doc (>= ${binary:Version}),
rust-src (>= ${binary:Version}),
+++ /dev/null
-# "libstd" just seemed too generic
-libstd-rust-1.54 binary: package-name-doesnt-match-sonames
-libstd-rust-1.54 binary: sharedobject-in-library-directory-missing-soname
-
-# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
-libstd-rust-1.54 binary: dev-pkg-without-shlib-symlink
-libstd-rust-1.54 binary: shlib-without-versioned-soname
-libstd-rust-1.54 binary: unused-shlib-entry-in-control-file
-
-# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
-# to libc. Lintian gets upset that some Rust libraries don't need
-# libc, boo hoo.
-libstd-rust-1.54 binary: library-not-linked-against-libc
--- /dev/null
+# "libstd" just seemed too generic
+libstd-rust-1.55 binary: package-name-doesnt-match-sonames
+libstd-rust-1.55 binary: sharedobject-in-library-directory-missing-soname
+
+# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
+libstd-rust-1.55 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.55 binary: shlib-without-versioned-soname
+libstd-rust-1.55 binary: unused-shlib-entry-in-control-file
+
+# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
+# to libc. Lintian gets upset that some Rust libraries don't need
+# libc, boo hoo.
+libstd-rust-1.55 binary: library-not-linked-against-libc
Bug: https://github.com/rust-lang/rust/issues/52108
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
-@@ -887,6 +887,8 @@
+@@ -904,6 +904,8 @@
# preserve existing RUSTFLAGS
env.setdefault("RUSTFLAGS", "")
env["RUSTFLAGS"] += " -Cdebuginfo=2"
target_features = []
--- a/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
+++ b/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
-@@ -11,7 +11,7 @@
+@@ -12,7 +12,7 @@
endian: Endian::Big,
// NOTE(mips64r2) matches C toolchain
cpu: "mips64r2".to_string(),
--- a/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
+++ b/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
-@@ -9,7 +9,7 @@
- options: TargetOptions {
+@@ -10,7 +10,7 @@
+ abi: "abi64".to_string(),
// NOTE(mips64r2) matches C toolchain
cpu: "mips64r2".to_string(),
- features: "+mips64r2".to_string(),
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
-@@ -429,7 +429,6 @@
+@@ -451,7 +451,6 @@
cargo
.arg("-p")
.arg(package)
.arg("--")
.arg("--markdown-css")
.arg("rust.css")
-@@ -560,7 +559,6 @@
+@@ -582,7 +581,6 @@
cargo.rustdocflag("-Znormalize-docs");
cargo.rustdocflag("--show-type-layout");
compile::rustc_cargo(builder, &mut cargo, target);
// Only include compiler crates, no dependencies of those, such as `libc`.
cargo.arg("--no-deps");
-@@ -652,7 +650,6 @@
- &[],
- );
+@@ -673,7 +671,6 @@
+ &[],
+ );
-- cargo.arg("-Zskip-rustdoc-fingerprint");
- // Only include compiler crates, no dependencies of those, such as `libc`.
- cargo.arg("--no-deps");
- cargo.arg("-p").arg("rustdoc");
+- cargo.arg("-Zskip-rustdoc-fingerprint");
+ // Only include compiler crates, no dependencies of those, such as `libc`.
+ cargo.arg("--no-deps");
+ $(
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
-@@ -1212,10 +1212,8 @@
+@@ -1289,10 +1289,8 @@
}
if mode == "rustdoc-json" {
ExpandYamlAnchors, "src/tools/expand-yaml-anchors", "expand-yaml-anchors";
LintDocs, "src/tools/lint-docs", "lint-docs";
- JsonDocCk, "src/tools/jsondocck", "jsondocck";
+ HtmlChecker, "src/tools/html-checker", "html-checker";
);
- #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, Ord, PartialOrd)]
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
-@@ -364,6 +364,8 @@
+@@ -383,6 +383,10 @@
.arg(&builder.src.join("src/doc/index.md"))
.arg("--markdown-playground-url")
.arg("https://play.rust-lang.org/")
+ .arg("--markdown-css")
++ .arg(format!("rustdoc{}.css", &builder.version))
++ .arg("--markdown-css")
+ .arg("rust.css")
.arg("-o")
.arg(&out)
.arg(&path);
-@@ -371,12 +373,6 @@
- if !builder.config.docs_minification {
+@@ -391,17 +395,6 @@
cmd.arg("--disable-minification");
}
--
+
- if filename == "not_found.md" {
-- cmd.arg("--markdown-css").arg("https://doc.rust-lang.org/rust.css");
+- cmd.arg("--markdown-css")
+- .arg(format!("https://doc.rust-lang.org/rustdoc{}.css", &builder.version))
+- .arg("--markdown-css")
+- .arg("https://doc.rust-lang.org/rust.css");
- } else {
-- cmd.arg("--markdown-css").arg("rust.css");
+- cmd.arg("--markdown-css")
+- .arg(format!("rustdoc{}.css", &builder.version))
+- .arg("--markdown-css")
+- .arg("rust.css");
- }
builder.run(&mut cmd);
}
# Patches for upstream
# pending, or forwarded
-u-86383.patch
u-89591.patch
u-85807.patch
# next one can be dropped after upgrading to LLVM 13
0001-Revert-Auto-merge-of-79547.patch
u-reproducible-build.patch
-u-ignore-endian-big.patch
u-ignore-endian-big-diff.patch
# not forwarded, or forwarded but unlikely to be merged
+++ /dev/null
-From aa53928ed7b763abd882f2a5efb8f98f53ccc6a9 Mon Sep 17 00:00:00 2001
-From: Alex Vlasov <alex.m.vlasov@gmail.com>
-Date: Sun, 20 Jun 2021 16:09:42 +0200
-Subject: [PATCH] Squashed implementation of the pass
-
- Note: for Debian we only care about the failing armhf test which is fixed by
- a subset of the PR, namely what's below. For details see
- https://github.com/rust-lang/rust/pull/86383#issuecomment-864521922
-
---- a/library/std/src/thread/local/tests.rs
-+++ b/library/std/src/thread/local/tests.rs
-@@ -297,7 +297,7 @@
- .unwrap();
-
- loop {
-- match SYNC_STATE.compare_exchange_weak(
-+ match SYNC_STATE.compare_exchange(
- THREAD1_WAITING,
- MAIN_THREAD_RENDEZVOUS,
- Ordering::SeqCst,
+++ /dev/null
-Forwarded: https://github.com/rust-lang/rust/pull/77413
-Bug: https://github.com/rust-lang/rust/issues/79799
-commit a311e14b9cb23419b6a287d651de7d02136a4be4
-Author: Ximin Luo <infinity0@pwned.gg>
-Date: Thu Oct 1 18:53:49 2020 +0100
-
- Ignore mir tests on big-endian
-
- Can be dropped in 1.55 and later.
-
---- a/src/test/mir-opt/const_prop/checked_add.rs
-+++ b/src/test/mir-opt/const_prop/checked_add.rs
-@@ -1,5 +1,5 @@
- // compile-flags: -C overflow-checks=on
--
-+// ignore-endian-big
- // EMIT_MIR checked_add.main.ConstProp.diff
- fn main() {
- let x: u32 = 1 + 1;
---- a/src/test/mir-opt/const_prop/mutable_variable_aggregate.rs
-+++ b/src/test/mir-opt/const_prop/mutable_variable_aggregate.rs
-@@ -1,5 +1,5 @@
- // compile-flags: -O
--
-+// ignore-endian-big
- // EMIT_MIR mutable_variable_aggregate.main.ConstProp.diff
- fn main() {
- let mut x = (42, 43);
---- a/src/test/mir-opt/const_prop/mutable_variable_no_prop.rs
-+++ b/src/test/mir-opt/const_prop/mutable_variable_no_prop.rs
-@@ -1,5 +1,5 @@
- // compile-flags: -O
--
-+// ignore-endian-big
- static mut STATIC: u32 = 42;
-
- // EMIT_MIR mutable_variable_no_prop.main.ConstProp.diff
---- a/src/test/mir-opt/const_prop/optimizes_into_variable.rs
-+++ b/src/test/mir-opt/const_prop/optimizes_into_variable.rs
-@@ -1,5 +1,5 @@
- // compile-flags: -C overflow-checks=on
--
-+// ignore-endian-big
- struct Point {
- x: u32,
- y: u32,
---- a/src/test/mir-opt/const_prop/return_place.rs
-+++ b/src/test/mir-opt/const_prop/return_place.rs
-@@ -1,5 +1,5 @@
- // compile-flags: -C overflow-checks=on
--
-+// ignore-endian-big
- // EMIT_MIR return_place.add.ConstProp.diff
- // EMIT_MIR return_place.add.PreCodegen.before.mir
- fn add() -> u32 {
---- a/src/test/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff
-+++ b/src/test/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff
-@@ -2,37 +2,37 @@
- + // MIR for `main` after ConstProp
-
- fn main() -> () {
-- let mut _0: (); // return place in scope 0 at $DIR/tuple_literal_propagation.rs:2:11: 2:11
-- let _1: (u32, u32); // in scope 0 at $DIR/tuple_literal_propagation.rs:3:9: 3:10
-- let _2: (); // in scope 0 at $DIR/tuple_literal_propagation.rs:5:5: 5:15
-- let mut _3: (u32, u32); // in scope 0 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
-+ let mut _0: (); // return place in scope 0 at $DIR/tuple_literal_propagation.rs:3:11: 3:11
-+ let _1: (u32, u32); // in scope 0 at $DIR/tuple_literal_propagation.rs:4:9: 4:10
-+ let _2: (); // in scope 0 at $DIR/tuple_literal_propagation.rs:6:5: 6:15
-+ let mut _3: (u32, u32); // in scope 0 at $DIR/tuple_literal_propagation.rs:6:13: 6:14
- scope 1 {
-- debug x => _1; // in scope 1 at $DIR/tuple_literal_propagation.rs:3:9: 3:10
-+ debug x => _1; // in scope 1 at $DIR/tuple_literal_propagation.rs:4:9: 4:10
- }
-
- bb0: {
-- StorageLive(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:3:9: 3:10
-- (_1.0: u32) = const 1_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
-- (_1.1: u32) = const 2_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
-- StorageLive(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:5:5: 5:15
-- StorageLive(_3); // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
--- _3 = _1; // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
--+ _3 = const (1_u32, 2_u32); // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
-+ StorageLive(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:4:9: 4:10
-+ (_1.0: u32) = const 1_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:4:13: 4:19
-+ (_1.1: u32) = const 2_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:4:13: 4:19
-+ StorageLive(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:6:5: 6:15
-+ StorageLive(_3); // scope 1 at $DIR/tuple_literal_propagation.rs:6:13: 6:14
-+- _3 = _1; // scope 1 at $DIR/tuple_literal_propagation.rs:6:13: 6:14
-++ _3 = const (1_u32, 2_u32); // scope 1 at $DIR/tuple_literal_propagation.rs:6:13: 6:14
- + // mir::Constant
--+ // + span: $DIR/tuple_literal_propagation.rs:5:13: 5:14
-++ // + span: $DIR/tuple_literal_propagation.rs:6:13: 6:14
- + // + literal: Const { ty: (u32, u32), val: Value(ByRef { alloc: Allocation { bytes: [1, 0, 0, 0, 2, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
-- _2 = consume(move _3) -> bb1; // scope 1 at $DIR/tuple_literal_propagation.rs:5:5: 5:15
-+ _2 = consume(move _3) -> bb1; // scope 1 at $DIR/tuple_literal_propagation.rs:6:5: 6:15
- // mir::Constant
-- // + span: $DIR/tuple_literal_propagation.rs:5:5: 5:12
-+ // + span: $DIR/tuple_literal_propagation.rs:6:5: 6:12
- // + literal: Const { ty: fn((u32, u32)) {consume}, val: Value(Scalar(<ZST>)) }
- }
-
- bb1: {
-- StorageDead(_3); // scope 1 at $DIR/tuple_literal_propagation.rs:5:14: 5:15
-- StorageDead(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:5:15: 5:16
-- nop; // scope 0 at $DIR/tuple_literal_propagation.rs:2:11: 6:2
-- StorageDead(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:6:1: 6:2
-- return; // scope 0 at $DIR/tuple_literal_propagation.rs:6:2: 6:2
-+ StorageDead(_3); // scope 1 at $DIR/tuple_literal_propagation.rs:6:14: 6:15
-+ StorageDead(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:6:15: 6:16
-+ nop; // scope 0 at $DIR/tuple_literal_propagation.rs:3:11: 7:2
-+ StorageDead(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:7:1: 7:2
-+ return; // scope 0 at $DIR/tuple_literal_propagation.rs:7:2: 7:2
- }
- }
-
---- a/src/test/mir-opt/const_prop/tuple_literal_propagation.rs
-+++ b/src/test/mir-opt/const_prop/tuple_literal_propagation.rs
-@@ -1,3 +1,4 @@
-+// ignore-endian-big
- // EMIT_MIR tuple_literal_propagation.main.ConstProp.diff
- fn main() {
- let x = (1, 2);
projects / rustc.git / commitdiff