From 7d69857dcb3e336f4cb576764d3e2cf0e7973f43 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Thu, 30 Jul 2020 14:58:27 +0200 Subject: Rustup to rustc 1.47.0-nightly (db0492ace 2020-07-29) --- build_sysroot/Cargo.lock | 87 +++++++++++------------------------ build_sysroot/Cargo.toml | 14 +++--- build_sysroot/alloc_system/Cargo.toml | 2 +- build_sysroot/prepare_sysroot_src.sh | 4 +- 4 files changed, 37 insertions(+), 70 deletions(-) (limited to 'build_sysroot') diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock index 0cf603a14a3..f23e44f8d18 100644 --- a/build_sysroot/Cargo.lock +++ b/build_sysroot/Cargo.lock @@ -1,27 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "addr2line" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" -dependencies = [ - "compiler_builtins", - "gimli", - "rustc-std-workspace-alloc", - "rustc-std-workspace-core", -] - -[[package]] -name = "adler" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" -dependencies = [ - "compiler_builtins", - "rustc-std-workspace-core", -] - [[package]] name = "alloc" version = "0.0.0" @@ -45,6 +23,32 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +[[package]] +name = "backtrace" +version = "0.3.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" +dependencies = [ + "backtrace-sys", + "cfg-if", + "compiler_builtins", + "libc", + "rustc-demangle", + "rustc-std-workspace-core", +] + +[[package]] +name = "backtrace-sys" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399" +dependencies = [ + "cc", + "compiler_builtins", + "libc", + "rustc-std-workspace-core", +] + [[package]] name = "cc" version = "1.0.58" @@ -106,17 +110,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "gimli" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" -dependencies = [ - "compiler_builtins", - "rustc-std-workspace-alloc", - "rustc-std-workspace-core", -] - [[package]] name = "hashbrown" version = "0.6.3" @@ -149,29 +142,6 @@ dependencies = [ "rustc-std-workspace-core", ] -[[package]] -name = "miniz_oxide" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" -dependencies = [ - "adler", - "compiler_builtins", - "rustc-std-workspace-alloc", - "rustc-std-workspace-core", -] - -[[package]] -name = "object" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" -dependencies = [ - "compiler_builtins", - "rustc-std-workspace-alloc", - "rustc-std-workspace-core", -] - [[package]] name = "panic_abort" version = "0.0.0" @@ -236,8 +206,8 @@ dependencies = [ name = "std" version = "0.0.0" dependencies = [ - "addr2line", "alloc", + "backtrace", "cfg-if", "compiler_builtins", "core", @@ -246,11 +216,8 @@ dependencies = [ "hashbrown", "hermit-abi", "libc", - "miniz_oxide", - "object", "panic_abort", "panic_unwind", - "rustc-demangle", "unwind", "wasi", ] diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml index 339e0d5fdc7..e562dedb532 100644 --- a/build_sysroot/Cargo.toml +++ b/build_sysroot/Cargo.toml @@ -4,18 +4,18 @@ name = "sysroot" version = "0.0.0" [dependencies] -core = { path = "./sysroot_src/src/libcore" } +core = { path = "./sysroot_src/library/core" } compiler_builtins = "0.1" -alloc = { path = "./sysroot_src/src/liballoc" } -std = { path = "./sysroot_src/src/libstd", features = ["panic_unwind", "backtrace"] } -test = { path = "./sysroot_src/src/libtest" } +alloc = { path = "./sysroot_src/library/alloc" } +std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] } +test = { path = "./sysroot_src/library/test" } alloc_system = { path = "./alloc_system" } [patch.crates-io] -rustc-std-workspace-core = { path = "./sysroot_src/src/tools/rustc-std-workspace-core" } -rustc-std-workspace-alloc = { path = "./sysroot_src/src/tools/rustc-std-workspace-alloc" } -rustc-std-workspace-std = { path = "./sysroot_src/src/tools/rustc-std-workspace-std" } +rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" } +rustc-std-workspace-alloc = { path = "./sysroot_src/library/rustc-std-workspace-alloc" } +rustc-std-workspace-std = { path = "./sysroot_src/library/rustc-std-workspace-std" } [profile.dev] lto = "off" diff --git a/build_sysroot/alloc_system/Cargo.toml b/build_sysroot/alloc_system/Cargo.toml index 221faab32bd..9fffca84300 100644 --- a/build_sysroot/alloc_system/Cargo.toml +++ b/build_sysroot/alloc_system/Cargo.toml @@ -8,6 +8,6 @@ path = "lib.rs" test = false doc = false [dependencies] -core = { path = "../sysroot_src/src/libcore" } +core = { path = "../sysroot_src/library/core" } libc = { version = "0.2.43", features = ['rustc-dep-of-std'], default-features = false } compiler_builtins = "0.1" diff --git a/build_sysroot/prepare_sysroot_src.sh b/build_sysroot/prepare_sysroot_src.sh index 882454754ed..14aa77478f5 100755 --- a/build_sysroot/prepare_sysroot_src.sh +++ b/build_sysroot/prepare_sysroot_src.sh @@ -11,8 +11,8 @@ if [ ! -e $SRC_DIR ]; then fi rm -rf $DST_DIR -mkdir -p $DST_DIR/src -cp -r $SRC_DIR/src $DST_DIR/ +mkdir -p $DST_DIR/library +cp -r $SRC_DIR/library $DST_DIR/ pushd $DST_DIR echo "[GIT] init" -- cgit 1.4.1-3-g733a5