From 2985c64454e9b611db774cf8c399463bb2108f9e Mon Sep 17 00:00:00 2001
From: Guillaume Endignoux <guillaumee@google.com>
Date: Tue, 4 Feb 2020 17:05:07 +0100
Subject: [PATCH] Bump rust-toolchain and linked-list-allocator versions.
---
patches/libtock-rs/01-linked_list_allocator.patch | 13 +++++++++++++
...1-panic_console.patch => 02-panic_console.patch} | 2 +-
.../libtock-rs/{02-timer.patch => 03-timer.patch} | 0
...blic_syscalls.patch => 04-public_syscalls.patch} | 0
.../{04-bigger_heap.patch => 05-bigger_heap.patch} | 0
rust-toolchain | 2 +-
6 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 patches/libtock-rs/01-linked_list_allocator.patch
rename patches/libtock-rs/{01-panic_console.patch => 02-panic_console.patch} (98%)
rename patches/libtock-rs/{02-timer.patch => 03-timer.patch} (100%)
rename patches/libtock-rs/{03-public_syscalls.patch => 04-public_syscalls.patch} (100%)
rename patches/libtock-rs/{04-bigger_heap.patch => 05-bigger_heap.patch} (100%)
diff --git a/patches/libtock-rs/01-linked_list_allocator.patch b/patches/libtock-rs/01-linked_list_allocator.patch
new file mode 100644
index 0000000..97a3695
--- /dev/null
+++ b/patches/libtock-rs/01-linked_list_allocator.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 29d9b79..30081f3 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -6,7 +6,7 @@ license = "MIT/Apache-2.0"
+ edition = "2018"
+
+ [dependencies]
+-linked_list_allocator = "0.6.4"
++linked_list_allocator = "0.6.6"
+
+ [dev-dependencies]
+ corepack = { version = "0.4.0", default-features = false, features = ["alloc"] }
diff --git a/patches/libtock-rs/01-panic_console.patch b/patches/libtock-rs/02-panic_console.patch
similarity index 98%
rename from patches/libtock-rs/01-panic_console.patch
rename to patches/libtock-rs/02-panic_console.patch
index dd8f31c..01d37e4 100644
--- a/patches/libtock-rs/01-panic_console.patch
+++ b/patches/libtock-rs/02-panic_console.patch
@@ -4,7 +4,7 @@ diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,9 @@
[dependencies]
- linked_list_allocator = "0.6.4"
+ linked_list_allocator = "0.6.6"
+
+[features]
+panic_console = []
diff --git a/patches/libtock-rs/02-timer.patch b/patches/libtock-rs/03-timer.patch
similarity index 100%
rename from patches/libtock-rs/02-timer.patch
rename to patches/libtock-rs/03-timer.patch
diff --git a/patches/libtock-rs/03-public_syscalls.patch b/patches/libtock-rs/04-public_syscalls.patch
similarity index 100%
rename from patches/libtock-rs/03-public_syscalls.patch
rename to patches/libtock-rs/04-public_syscalls.patch
diff --git a/patches/libtock-rs/04-bigger_heap.patch b/patches/libtock-rs/05-bigger_heap.patch
similarity index 100%
rename from patches/libtock-rs/04-bigger_heap.patch
rename to patches/libtock-rs/05-bigger_heap.patch
diff --git a/rust-toolchain b/rust-toolchain
index 20d9cda..605c8f9 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-01-16
+nightly-2020-02-03
--
GitLab