mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rustup to rustc 1.39.0-nightly (f0b58fcf0 2019-09-11)

Browse source
This commit is contained in:
bjorn3 2019-09-12 20:01:05 +02:00
parent 71482b5ca6
commit 3e78ca957e
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_sysroot/Cargo.toml
View file

@ -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" }

23
patches/0019-Workaround-rust-regression.patch
View file

@ -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)