diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2019-09-12 20:01:05 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2019-09-12 20:21:54 +0200 |
| commit | 3e78ca957ef7ed07f2504f32ea973f248dafcd10 (patch) | |
| tree | 6b4e8cc121c3f1c72e30ae65e3e0aeedabaf99d7 | |
| parent | 71482b5ca6913a13bd017bb08f3ffb89f4c3ed9c (diff) | |
| download | rust-3e78ca957ef7ed07f2504f32ea973f248dafcd10.tar.gz rust-3e78ca957ef7ed07f2504f32ea973f248dafcd10.zip | |
Rustup to rustc 1.39.0-nightly (f0b58fcf0 2019-09-11)
| -rw-r--r-- | build_sysroot/Cargo.toml | 2 | ||||
| -rw-r--r-- | patches/0019-Workaround-rust-regression.patch | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml index 1039f4613ef..24feabb2226 100644 --- a/build_sysroot/Cargo.toml +++ b/build_sysroot/Cargo.toml @@ -7,7 +7,7 @@ version = "0.0.0" core = { path = "./sysroot_src/src/libcore" } compiler_builtins = "0.1" alloc = { path = "./sysroot_src/src/liballoc" } -std = { path = "./sysroot_src/src/libstd", features = ["panic_unwind"] } +std = { path = "./sysroot_src/src/libstd", features = ["panic_unwind", "backtrace"] } test = { path = "./sysroot_src/src/libtest" } alloc_system = { path = "./alloc_system" } diff --git a/patches/0019-Workaround-rust-regression.patch b/patches/0019-Workaround-rust-regression.patch deleted file mode 100644 index 524af0b39a6..00000000000 --- a/patches/0019-Workaround-rust-regression.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8956b4fa10af0df2f8912f6116aa1e970dc0283a Mon Sep 17 00:00:00 2001 -From: bjorn3 <bjorn3@users.noreply.github.com> -Date: Sun, 18 Aug 2019 17:44:47 +0200 -Subject: [PATCH] Workaround rust regression - ---- - src/liballoc/macros.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/liballoc/macros.rs b/src/liballoc/macros.rs -index 0b5e186..250c419 100644 ---- a/src/liballoc/macros.rs -+++ b/src/liballoc/macros.rs -@@ -98,5 +98,5 @@ macro_rules! vec { - #[macro_export] - #[stable(feature = "rust1", since = "1.0.0")] - macro_rules! format { -- ($($arg:tt)*) => ($crate::fmt::format(::core::format_args!($($arg)*))) -+ ($($arg:tt)*) => ($crate::fmt::format(format_args!($($arg)*))) - } --- -2.20.1 (Apple Git-117) - |