From 20be65444062d788550a57c62104ae41d253d4e5 Mon Sep 17 00:00:00 2001 From: hyd-dev Date: Sat, 24 Jul 2021 13:07:36 +0800 Subject: [PATCH 1/2] Empty `core_miri_test` and `alloc_miri_test` unless `cfg(any(test, doctest))` --- alloc_miri_test/Cargo.toml | 6 ++++++ core_miri_test/Cargo.toml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/alloc_miri_test/Cargo.toml b/alloc_miri_test/Cargo.toml index 7c7eb2e..8195800 100644 --- a/alloc_miri_test/Cargo.toml +++ b/alloc_miri_test/Cargo.toml @@ -10,6 +10,12 @@ edition = "2018" name = "alloc_miri_test" path = "../liballoc/src/lib.rs" +[features] +# Empty this crate to avoid two copies of liballoc. +# See https://github.com/rust-lang/miri-test-libstd/issues/4. +default = ["miri-test-libstd"] +miri-test-libstd = [] + [dependencies] [dev-dependencies] diff --git a/core_miri_test/Cargo.toml b/core_miri_test/Cargo.toml index 524cce8..e25c244 100644 --- a/core_miri_test/Cargo.toml +++ b/core_miri_test/Cargo.toml @@ -12,6 +12,12 @@ path = "../libcore/src/lib.rs" test = false bench = false +[features] +# Empty this crate to avoid two copies of libcore. +# See https://github.com/rust-lang/miri-test-libstd/issues/4. +default = ["miri-test-libstd"] +miri-test-libstd = [] + [[test]] name = "coretests" path = "../libcore/tests/lib.rs" From d5bab733b700924eaa6b5e034c279ead82e73b71 Mon Sep 17 00:00:00 2001 From: hyd-dev Date: Sat, 24 Jul 2021 13:13:57 +0800 Subject: [PATCH 2/2] Bump `rust-version` --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 7948996..2e83157 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2021-07-09 +nightly-2021-07-24