From be20836c7597e76eb2ce0cfab4c64d4fc0fd02bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 11 Feb 2020 21:42:15 +0100 Subject: [PATCH] rebase and update patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mostly for context changes, some new error detail hunks. Signed-off-by: Fabian Grünbichler --- debian/patches/d-dont-download-stage0.patch | 4 +- debian/patches/d-ignore-avx-44056.patch | 8 +- .../patches/d-ignore-error-detail-diff.patch | 581 ++++++++++-------- debian/patches/d-no-jemalloc.patch | 11 +- debian/patches/u-test-python-3.patch | 10 - 5 files changed, 337 insertions(+), 277 deletions(-) diff --git a/debian/patches/d-dont-download-stage0.patch b/debian/patches/d-dont-download-stage0.patch index cc4dbe79b2..e9db0941f1 100644 --- a/debian/patches/d-dont-download-stage0.patch +++ b/debian/patches/d-dont-download-stage0.patch @@ -38,12 +38,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ delete_if_present(temp_path, verbose) -@@ -373,7 +374,7 @@ +@@ -401,7 +401,7 @@ url = "{}/dist/{}".format(self._download_url, self.date) tarball = os.path.join(rustc_cache, filename) - if not os.path.exists(tarball): + if True: get("{}/{}".format(url, filename), tarball, verbose=self.verbose) - unpack(tarball, self.bin_root(), match=pattern, verbose=self.verbose) + unpack(tarball, tarball_suffix, self.bin_root(), match=pattern, verbose=self.verbose) diff --git a/debian/patches/d-ignore-avx-44056.patch b/debian/patches/d-ignore-avx-44056.patch index 9891ba98f0..bffda4d1ec 100644 --- a/debian/patches/d-ignore-avx-44056.patch +++ b/debian/patches/d-ignore-avx-44056.patch @@ -1,10 +1,10 @@ Bug: https://github.com/rust-lang/rust/pull/55667 -Index: rustc/src/test/ui/issues/issue-44056.rs +Index: rust/src/test/ui/issues/issue-44056.rs =================================================================== ---- rustc.orig/src/test/ui/issues/issue-44056.rs -+++ rustc/src/test/ui/issues/issue-44056.rs +--- rust.orig/src/test/ui/issues/issue-44056.rs ++++ rust/src/test/ui/issues/issue-44056.rs @@ -1,5 +1,5 @@ - // build-pass (FIXME(62277): could be check-pass?) + // build-pass (FIXME(55996): should be run on targets supporting avx) -// only-x86_64 +// ignore-test // no-prefer-dynamic diff --git a/debian/patches/d-ignore-error-detail-diff.patch b/debian/patches/d-ignore-error-detail-diff.patch index ff9cfc7bdf..69c82d6fc1 100644 --- a/debian/patches/d-ignore-error-detail-diff.patch +++ b/debian/patches/d-ignore-error-detail-diff.patch @@ -1,9 +1,11 @@ Description: Ignore error details with $SRC_DIR We build with --remap-path-prefix so it doesn't work, see bug below Bug: https://github.com/rust-lang/rust/issues/53081 ---- a/src/test/ui/impl-trait/impl-generic-mismatch.stderr -+++ b/src/test/ui/impl-trait/impl-generic-mismatch.stderr -@@ -31,11 +31,6 @@ +Index: rust/src/test/ui/impl-trait/impl-generic-mismatch.stderr +=================================================================== +--- rust.orig/src/test/ui/impl-trait/impl-generic-mismatch.stderr ++++ rust/src/test/ui/impl-trait/impl-generic-mismatch.stderr +@@ -31,11 +31,6 @@ error[E0643]: method `hash` has incompat | LL | fn hash(&self, hasher: &mut impl Hasher) {} | ^^^^^^^^^^^ expected generic parameter, found `impl Trait` @@ -15,12 +17,282 @@ Bug: https://github.com/rust-lang/rust/issues/53081 error: aborting due to 3 previous errors ---- a/src/test/ui/consts/const-size_of-cycle.stderr -+++ b/src/test/ui/consts/const-size_of-cycle.stderr -@@ -10,15 +10,7 @@ +Index: rust/src/test/ui/closures/closure-move-sync.stderr +=================================================================== +--- rust.orig/src/test/ui/closures/closure-move-sync.stderr ++++ rust/src/test/ui/closures/closure-move-sync.stderr +@@ -3,11 +3,6 @@ error[E0277]: `std::sync::mpsc::Receiver + | + LL | let t = thread::spawn(|| { + | ^^^^^^^^^^^^^ `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely +- | +- ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL +- | +-LL | F: FnOnce() -> T, F: Send + 'static, T: Send + 'static +- | ---- required by this bound in `std::thread::spawn` + | + = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Receiver<()>` + = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Receiver<()>` +@@ -18,11 +13,6 @@ error[E0277]: `std::sync::mpsc::Sender<( + | + LL | thread::spawn(|| tx.send(()).unwrap()); + | ^^^^^^^^^^^^^ `std::sync::mpsc::Sender<()>` cannot be shared between threads safely +- | +- ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL +- | +-LL | F: FnOnce() -> T, F: Send + 'static, T: Send + 'static +- | ---- required by this bound in `std::thread::spawn` + | + = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Sender<()>` + = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Sender<()>` +Index: rust/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr +=================================================================== +--- rust.orig/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr ++++ rust/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr +@@ -3,11 +3,6 @@ error[E0277]: the trait bound `Error: st + | + LL | x: Error + | ^^^^^^^^ the trait `std::hash::Hash` is not implemented for `Error` +- | +- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL +- | +-LL | fn hash(&self, state: &mut H); +- | - required by this bound in `std::hash::Hash::hash` + + error: aborting due to previous error + +Index: rust/src/test/ui/derives/derives-span-Hash-enum.stderr +=================================================================== +--- rust.orig/src/test/ui/derives/derives-span-Hash-enum.stderr ++++ rust/src/test/ui/derives/derives-span-Hash-enum.stderr +@@ -3,11 +3,6 @@ error[E0277]: the trait bound `Error: st + | + LL | Error + | ^^^^^ the trait `std::hash::Hash` is not implemented for `Error` +- | +- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL +- | +-LL | fn hash(&self, state: &mut H); +- | - required by this bound in `std::hash::Hash::hash` + + error: aborting due to previous error + +Index: rust/src/test/ui/derives/derives-span-Hash-struct.stderr +=================================================================== +--- rust.orig/src/test/ui/derives/derives-span-Hash-struct.stderr ++++ rust/src/test/ui/derives/derives-span-Hash-struct.stderr +@@ -3,11 +3,6 @@ error[E0277]: the trait bound `Error: st + | + LL | x: Error + | ^^^^^^^^ the trait `std::hash::Hash` is not implemented for `Error` +- | +- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL +- | +-LL | fn hash(&self, state: &mut H); +- | - required by this bound in `std::hash::Hash::hash` + + error: aborting due to previous error + +Index: rust/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr +=================================================================== +--- rust.orig/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr ++++ rust/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr +@@ -3,11 +3,6 @@ error[E0277]: the trait bound `Error: st + | + LL | Error + | ^^^^^ the trait `std::hash::Hash` is not implemented for `Error` +- | +- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL +- | +-LL | fn hash(&self, state: &mut H); +- | - required by this bound in `std::hash::Hash::hash` + + error: aborting due to previous error + +Index: rust/src/test/ui/interior-mutability/interior-mutability.stderr +=================================================================== +--- rust.orig/src/test/ui/interior-mutability/interior-mutability.stderr ++++ rust/src/test/ui/interior-mutability/interior-mutability.stderr +@@ -3,11 +3,6 @@ error[E0277]: the type `std::cell::Unsaf + | + LL | catch_unwind(|| { x.set(23); }); + | ^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary +- | +- ::: $SRC_DIR/libstd/panic.rs:LL:COL +- | +-LL | pub fn catch_unwind R + UnwindSafe, R>(f: F) -> Result { +- | ---------- required by this bound in `std::panic::catch_unwind` + | + = help: within `std::cell::Cell`, the trait `std::panic::RefUnwindSafe` is not implemented for `std::cell::UnsafeCell` + = note: required because it appears within the type `std::cell::Cell` +Index: rust/src/test/ui/issues/issue-21160.stderr +=================================================================== +--- rust.orig/src/test/ui/issues/issue-21160.stderr ++++ rust/src/test/ui/issues/issue-21160.stderr +@@ -3,11 +3,6 @@ error[E0277]: the trait bound `Bar: std: + | + LL | struct Foo(Bar); + | ^^^ the trait `std::hash::Hash` is not implemented for `Bar` +- | +- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL +- | +-LL | fn hash(&self, state: &mut H); +- | - required by this bound in `std::hash::Hash::hash` + + error: aborting due to previous error + +Index: rust/src/test/ui/no-send-res-ports.stderr +=================================================================== +--- rust.orig/src/test/ui/no-send-res-ports.stderr ++++ rust/src/test/ui/no-send-res-ports.stderr +@@ -3,11 +3,6 @@ error[E0277]: `std::rc::Rc<()>` cannot b + | + LL | thread::spawn(move|| { + | ^^^^^^^^^^^^^ `std::rc::Rc<()>` cannot be sent between threads safely +- | +- ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL +- | +-LL | F: FnOnce() -> T, F: Send + 'static, T: Send + 'static +- | ---- required by this bound in `std::thread::spawn` + | + = help: within `[closure@$DIR/no-send-res-ports.rs:26:19: 30:6 x:main::Foo]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>` + = note: required because it appears within the type `Port<()>` +Index: rust/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr +=================================================================== +--- rust.orig/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr ++++ rust/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr +@@ -5,11 +5,6 @@ LL | / fn can_parse_zero_as_f32() -> Res + LL | | "0".parse() + LL | | } + | |_^ `main` can only return types that implement `std::process::Termination` +- | +- ::: $SRC_DIR/libtest/lib.rs:LL:COL +- | +-LL | pub fn assert_test_result(result: T) { +- | ----------- required by this bound in `test::assert_test_result` + | + = help: the trait `std::process::Termination` is not implemented for `std::result::Result` + +Index: rust/src/test/ui/traits/trait-suggest-where-clause.stderr +=================================================================== +--- rust.orig/src/test/ui/traits/trait-suggest-where-clause.stderr ++++ rust/src/test/ui/traits/trait-suggest-where-clause.stderr +@@ -6,11 +6,6 @@ LL | fn check() + LL | // suggest a where-clause, if needed + LL | mem::size_of::(); + | ^ doesn't have a size known at compile-time +- | +- ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL +- | +-LL | pub const fn size_of() -> usize { +- | - required by this bound in `std::mem::size_of` + | + = help: the trait `std::marker::Sized` is not implemented for `U` + = note: to learn more, visit +@@ -23,11 +18,6 @@ LL | fn check() + ... + LL | mem::size_of::>(); + | ^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time +- | +- ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL +- | +-LL | pub const fn size_of() -> usize { +- | - required by this bound in `std::mem::size_of` + | + = help: within `Misc`, the trait `std::marker::Sized` is not implemented for `U` + = note: to learn more, visit +@@ -62,11 +52,6 @@ error[E0277]: the size for values of typ + | + LL | mem::size_of::<[T]>(); + | ^^^ doesn't have a size known at compile-time +- | +- ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL +- | +-LL | pub const fn size_of() -> usize { +- | - required by this bound in `std::mem::size_of` + | + = help: the trait `std::marker::Sized` is not implemented for `[T]` + = note: to learn more, visit +@@ -76,11 +61,6 @@ error[E0277]: the size for values of typ + | + LL | mem::size_of::<[&U]>(); + | ^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time +- | +- ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL +- | +-LL | pub const fn size_of() -> usize { +- | - required by this bound in `std::mem::size_of` + | + = help: the trait `std::marker::Sized` is not implemented for `[&U]` + = note: to learn more, visit +Index: rust/src/test/ui/type_length_limit.stderr +=================================================================== +--- rust.orig/src/test/ui/type_length_limit.stderr ++++ rust/src/test/ui/type_length_limit.stderr +@@ -1,8 +1,4 @@ + error: reached the type-length limit while instantiating `std::mem::drop::>` +- --> $SRC_DIR/libcore/mem/mod.rs:LL:COL +- | +-LL | pub fn drop(_x: T) { } +- | ^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = note: consider adding a `#![type_length_limit="1094"]` attribute to your crate + +Index: rust/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr +=================================================================== +--- rust.orig/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr ++++ rust/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr +@@ -22,10 +22,6 @@ LL | extern crate std as Vec; + LL | define_vec!(); + | -------------- in this macro invocation + note: `Vec` could also refer to the struct defined here +- --> $SRC_DIR/libstd/prelude/v1.rs:LL:COL +- | +-LL | pub use crate::vec::Vec; +- | ^^^^^^^^^^^^^^^ + + error: aborting due to 2 previous errors + +Index: rust/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr +=================================================================== +--- rust.orig/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr ++++ rust/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr +@@ -3,11 +3,6 @@ error: `impl` item signature doesn't mat + | + LL | fn deref(&self) -> &dyn Trait { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found fn(&Struct) -> &dyn Trait +- | +- ::: $SRC_DIR/libcore/ops/deref.rs:LL:COL +- | +-LL | fn deref(&self) -> &Self::Target; +- | --------------------------------- expected fn(&Struct) -> &(dyn Trait + 'static) + | + = note: expected `fn(&Struct) -> &(dyn Trait + 'static)` + found `fn(&Struct) -> &dyn Trait` +Index: rust/src/test/ui/async-await/issues/issue-62009-1.stderr +=================================================================== +--- rust.orig/src/test/ui/async-await/issues/issue-62009-1.stderr ++++ rust/src/test/ui/async-await/issues/issue-62009-1.stderr +@@ -32,11 +32,6 @@ error[E0277]: the trait bound `[closure@ + | + LL | (|_| 2333).await; + | ^^^^^^^^^^^^^^^^ the trait `std::future::Future` is not implemented for `[closure@$DIR/issue-62009-1.rs:13:5: 13:15]` +- | +- ::: $SRC_DIR/libstd/future.rs:LL:COL +- | +-LL | F: Future +- | ------ required by this bound in `std::future::poll_with_tls_context` + + error: aborting due to 4 previous errors + +Index: rust/src/test/ui/consts/const-size_of-cycle.stderr +=================================================================== +--- rust.orig/src/test/ui/consts/const-size_of-cycle.stderr ++++ rust/src/test/ui/consts/const-size_of-cycle.stderr +@@ -15,15 +15,7 @@ note: ...which requires const-evaluating LL | bytes: [u8; std::mem::size_of::()] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - note: ...which requires const-evaluating `Foo::bytes::{{constant}}#0`... + note: ...which requires const-evaluating `std::mem::size_of`... - --> $SRC_DIR/libcore/mem/mod.rs:LL:COL - | -LL | intrinsics::size_of::() @@ -33,222 +305,11 @@ Bug: https://github.com/rust-lang/rust/issues/53081 = note: ...which requires computing layout of `Foo`... = note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`... = note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle ---- a/src/test/ui/async-await/issues/issue-62009-1.stderr -+++ b/src/test/ui/async-await/issues/issue-62009-1.stderr -@@ -32,11 +32,6 @@ - | - LL | (|_| 2333).await; - | ^^^^^^^^^^^^^^^^ the trait `std::future::Future` is not implemented for `[closure@$DIR/issue-62009-1.rs:14:5: 14:15]` -- | -- ::: $SRC_DIR/libstd/future.rs:LL:COL -- | --LL | F: Future -- | ------ required by this bound in `std::future::poll_with_tls_context` - - error: aborting due to 4 previous errors - ---- a/src/test/ui/closures/closure-move-sync.stderr -+++ b/src/test/ui/closures/closure-move-sync.stderr -@@ -3,11 +3,6 @@ - | - LL | let t = thread::spawn(|| { - | ^^^^^^^^^^^^^ `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely -- | -- ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL -- | --LL | F: FnOnce() -> T, F: Send + 'static, T: Send + 'static -- | ---- required by this bound in `std::thread::spawn` - | - = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Receiver<()>` - = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Receiver<()>` -@@ -18,11 +13,6 @@ - | - LL | thread::spawn(|| tx.send(()).unwrap()); - | ^^^^^^^^^^^^^ `std::sync::mpsc::Sender<()>` cannot be shared between threads safely -- | -- ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL -- | --LL | F: FnOnce() -> T, F: Send + 'static, T: Send + 'static -- | ---- required by this bound in `std::thread::spawn` - | - = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Sender<()>` - = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Sender<()>` ---- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr -+++ b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr -@@ -3,11 +3,6 @@ - | - LL | x: Error - | ^^^^^^^^ the trait `std::hash::Hash` is not implemented for `Error` -- | -- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL -- | --LL | fn hash(&self, state: &mut H); -- | - required by this bound in `std::hash::Hash::hash` - - error: aborting due to previous error - ---- a/src/test/ui/derives/derives-span-Hash-enum.stderr -+++ b/src/test/ui/derives/derives-span-Hash-enum.stderr -@@ -3,11 +3,6 @@ - | - LL | Error - | ^^^^^ the trait `std::hash::Hash` is not implemented for `Error` -- | -- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL -- | --LL | fn hash(&self, state: &mut H); -- | - required by this bound in `std::hash::Hash::hash` - - error: aborting due to previous error - ---- a/src/test/ui/derives/derives-span-Hash-struct.stderr -+++ b/src/test/ui/derives/derives-span-Hash-struct.stderr -@@ -3,11 +3,6 @@ - | - LL | x: Error - | ^^^^^^^^ the trait `std::hash::Hash` is not implemented for `Error` -- | -- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL -- | --LL | fn hash(&self, state: &mut H); -- | - required by this bound in `std::hash::Hash::hash` - - error: aborting due to previous error - ---- a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr -+++ b/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr -@@ -3,11 +3,6 @@ - | - LL | Error - | ^^^^^ the trait `std::hash::Hash` is not implemented for `Error` -- | -- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL -- | --LL | fn hash(&self, state: &mut H); -- | - required by this bound in `std::hash::Hash::hash` - - error: aborting due to previous error - ---- a/src/test/ui/interior-mutability/interior-mutability.stderr -+++ b/src/test/ui/interior-mutability/interior-mutability.stderr -@@ -3,11 +3,6 @@ - | - LL | catch_unwind(|| { x.set(23); }); - | ^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary -- | -- ::: $SRC_DIR/libstd/panic.rs:LL:COL -- | --LL | pub fn catch_unwind R + UnwindSafe, R>(f: F) -> Result { -- | ---------- required by this bound in `std::panic::catch_unwind` - | - = help: within `std::cell::Cell`, the trait `std::panic::RefUnwindSafe` is not implemented for `std::cell::UnsafeCell` - = note: required because it appears within the type `std::cell::Cell` ---- a/src/test/ui/issues/issue-21160.stderr -+++ b/src/test/ui/issues/issue-21160.stderr -@@ -3,11 +3,6 @@ - | - LL | struct Foo(Bar); - | ^^^ the trait `std::hash::Hash` is not implemented for `Bar` -- | -- ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL -- | --LL | fn hash(&self, state: &mut H); -- | - required by this bound in `std::hash::Hash::hash` - - error: aborting due to previous error - ---- a/src/test/ui/no-send-res-ports.stderr -+++ b/src/test/ui/no-send-res-ports.stderr -@@ -3,11 +3,6 @@ - | - LL | thread::spawn(move|| { - | ^^^^^^^^^^^^^ `std::rc::Rc<()>` cannot be sent between threads safely -- | -- ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL -- | --LL | F: FnOnce() -> T, F: Send + 'static, T: Send + 'static -- | ---- required by this bound in `std::thread::spawn` - | - = help: within `[closure@$DIR/no-send-res-ports.rs:27:19: 31:6 x:main::Foo]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>` - = note: required because it appears within the type `Port<()>` ---- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr -+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr -@@ -5,11 +5,6 @@ - LL | | "0".parse() - LL | | } - | |_^ `main` can only return types that implement `std::process::Termination` -- | -- ::: $SRC_DIR/libtest/lib.rs:LL:COL -- | --LL | pub fn assert_test_result(result: T) { -- | ----------- required by this bound in `test::assert_test_result` - | - = help: the trait `std::process::Termination` is not implemented for `std::result::Result` - ---- a/src/test/ui/traits/trait-suggest-where-clause.stderr -+++ b/src/test/ui/traits/trait-suggest-where-clause.stderr -@@ -6,11 +6,6 @@ - LL | // suggest a where-clause, if needed - LL | mem::size_of::(); - | ^ doesn't have a size known at compile-time -- | -- ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL -- | --LL | pub const fn size_of() -> usize { -- | - required by this bound in `std::mem::size_of` - | - = help: the trait `std::marker::Sized` is not implemented for `U` - = note: to learn more, visit -@@ -23,11 +18,6 @@ - ... - LL | mem::size_of::>(); - | ^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time -- | -- ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL -- | --LL | pub const fn size_of() -> usize { -- | - required by this bound in `std::mem::size_of` - | - = help: within `Misc`, the trait `std::marker::Sized` is not implemented for `U` - = note: to learn more, visit -@@ -62,11 +52,6 @@ - | - LL | mem::size_of::<[T]>(); - | ^^^ doesn't have a size known at compile-time -- | -- ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL -- | --LL | pub const fn size_of() -> usize { -- | - required by this bound in `std::mem::size_of` - | - = help: the trait `std::marker::Sized` is not implemented for `[T]` - = note: to learn more, visit -@@ -76,11 +61,6 @@ - | - LL | mem::size_of::<[&U]>(); - | ^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time -- | -- ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL -- | --LL | pub const fn size_of() -> usize { -- | - required by this bound in `std::mem::size_of` - | - = help: the trait `std::marker::Sized` is not implemented for `[&U]` - = note: to learn more, visit ---- a/src/test/ui/type_length_limit.stderr -+++ b/src/test/ui/type_length_limit.stderr -@@ -1,8 +1,4 @@ - error: reached the type-length limit while instantiating `std::mem::drop::>` -- --> $SRC_DIR/libcore/mem/mod.rs:LL:COL -- | --LL | pub fn drop(_x: T) { } -- | ^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: consider adding a `#![type_length_limit="1094"]` attribute to your crate - ---- a/src/test/ui/consts/offset_from_ub.stderr -+++ b/src/test/ui/consts/offset_from_ub.stderr -@@ -1,11 +1,4 @@ +Index: rust/src/test/ui/consts/offset_from_ub.stderr +=================================================================== +--- rust.orig/src/test/ui/consts/offset_from_ub.stderr ++++ rust/src/test/ui/consts/offset_from_ub.stderr +@@ -1,12 +1,5 @@ error: any use of this value will cause an error - --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL - | @@ -260,7 +321,8 @@ Bug: https://github.com/rust-lang/rust/issues/53081 | ::: $DIR/offset_from_ub.rs:13:1 | -@@ -21,13 +14,6 @@ + LL | / pub const DIFFERENT_ALLOC: usize = { +@@ -21,14 +13,7 @@ LL | | }; = note: `#[deny(const_err)]` on by default error: any use of this value will cause an error @@ -274,7 +336,8 @@ Bug: https://github.com/rust-lang/rust/issues/53081 | ::: $DIR/offset_from_ub.rs:23:1 | -@@ -38,13 +24,6 @@ + LL | / pub const NOT_PTR: usize = { +@@ -38,14 +22,7 @@ LL | | }; | |__- error: any use of this value will cause an error @@ -284,48 +347,54 @@ Bug: https://github.com/rust-lang/rust/issues/53081 - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | exact_div: 1 cannot be divided by 2 without remainder -- | inside call to `std::ptr::::offset_from` at $DIR/offset_from_ub.rs:33:27 +- | inside call to `std::ptr::::offset_from` at $DIR/offset_from_ub.rs:33:14 | ::: $DIR/offset_from_ub.rs:28:1 | ---- a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr -+++ b/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr -@@ -22,10 +22,6 @@ - LL | define_vec!(); - | -------------- in this macro invocation - note: `Vec` could also refer to the struct defined here -- --> $SRC_DIR/libstd/prelude/v1.rs:LL:COL -- | --LL | pub use crate::vec::Vec; -- | ^^^^^^^^^^^^^^^ + LL | / pub const NOT_MULTIPLE_OF_SIZE: isize = { +@@ -58,14 +34,7 @@ LL | | }; + | |__- - error: aborting due to 2 previous errors - ---- a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr -+++ b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr -@@ -3,11 +3,6 @@ - | - LL | fn deref(&self) -> &dyn Trait { - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found fn(&Struct) -> &dyn Trait -- | -- ::: $SRC_DIR/libcore/ops/deref.rs:LL:COL + error: any use of this value will cause an error +- --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL - | --LL | fn deref(&self) -> &Self::Target; -- | --------------------------------- expected fn(&Struct) -> &(dyn Trait + 'static) +-LL | intrinsics::ptr_offset_from(self, origin) +- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +- | | +- | invalid use of NULL pointer +- | inside call to `std::ptr::::offset_from` at $DIR/offset_from_ub.rs:39:14 + | + ::: $DIR/offset_from_ub.rs:36:1 | - = note: expected `fn(&Struct) -> &(dyn Trait + 'static)` - found `fn(&Struct) -> &dyn Trait` ---- a/src/test/ui/issues/issue-27033.stderr -+++ b/src/test/ui/issues/issue-27033.stderr -@@ -3,11 +3,6 @@ + LL | / pub const OFFSET_FROM_NULL: isize = { +@@ -76,14 +44,7 @@ LL | | }; + | |__- + + error: any use of this value will cause an error +- --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL +- | +-LL | intrinsics::ptr_offset_from(self, origin) +- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +- | | +- | a memory access tried to interpret some bytes as a pointer +- | inside call to `std::ptr::::offset_from` at $DIR/offset_from_ub.rs:46:14 + | + ::: $DIR/offset_from_ub.rs:42:1 + | + LL | / pub const DIFFERENT_INT: isize = { // offset_from with two different integers: like DIFFERENT_ALLOC +Index: rust/src/test/ui/issues/issue-27033.stderr +=================================================================== +--- rust.orig/src/test/ui/issues/issue-27033.stderr ++++ rust/src/test/ui/issues/issue-27033.stderr +@@ -3,11 +3,6 @@ error[E0530]: match bindings cannot shad | LL | None @ _ => {} | ^^^^ cannot be named the same as a unit variant - | - ::: $SRC_DIR/libstd/prelude/v1.rs:LL:COL - | --LL | pub use crate::option::Option::{self, Some, None}; -- | ---- the unit variant `None` is defined here +-LL | pub use crate::option::Option::{self, None, Some}; +- | ---- the unit variant `None` is defined here error[E0530]: match bindings cannot shadow constants - --> $DIR/issue-27033.rs:9:9 + --> $DIR/issue-27033.rs:8:9 diff --git a/debian/patches/d-no-jemalloc.patch b/debian/patches/d-no-jemalloc.patch index a666a0cea3..d19de872c8 100644 --- a/debian/patches/d-no-jemalloc.patch +++ b/debian/patches/d-no-jemalloc.patch @@ -1,8 +1,8 @@ -Index: rustc/src/rustc/Cargo.toml +Index: rust/src/rustc/Cargo.toml =================================================================== ---- rustc.orig/src/rustc/Cargo.toml -+++ rustc/src/rustc/Cargo.toml -@@ -15,11 +15,3 @@ rustc_driver = { path = "../librustc_dri +--- rust.orig/src/rustc/Cargo.toml ++++ rust/src/rustc/Cargo.toml +@@ -15,12 +15,5 @@ rustc_driver = { path = "../librustc_dri # Make sure rustc_codegen_ssa ends up in the sysroot, because this # crate is intended to be used by codegen backends, which may not be in-tree. rustc_codegen_ssa = { path = "../librustc_codegen_ssa" } @@ -12,5 +12,6 @@ Index: rustc/src/rustc/Cargo.toml -optional = true -features = ['unprefixed_malloc_on_supported_platforms'] - --[features] + [features] -jemalloc = ['jemalloc-sys'] + llvm = ['rustc_driver/llvm'] diff --git a/debian/patches/u-test-python-3.patch b/debian/patches/u-test-python-3.patch index a2cc344d59..48c98913c8 100644 --- a/debian/patches/u-test-python-3.patch +++ b/debian/patches/u-test-python-3.patch @@ -1,13 +1,3 @@ ---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py -+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py -@@ -22,6 +22,7 @@ - if to_input is None: - child = Popen(command, stdout=PIPE, stderr=PIPE) - else: -+ to_input = to_input.encode("utf-8") - child = Popen(command, stdout=PIPE, stderr=PIPE, stdin=PIPE) - stdout, stderr = child.communicate(input=to_input) - return (convert_to_string(stdout), convert_to_string(stderr)) --- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile @@ -1,2 +1,2 @@