diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
commit | 9835e2ae736235810b4ea1c162ca5e65c547e770 (patch) | |
tree | 3fcebf40ed70e581d776a8a4c65923e8ec20e026 /src/tools/cargo/tests/testsuite/mock-std/library | |
parent | Releasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff) | |
download | rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/tools/cargo/tests/testsuite/mock-std/library')
3 files changed, 16 insertions, 7 deletions
diff --git a/src/tools/cargo/tests/testsuite/mock-std/library/sysroot/Cargo.toml b/src/tools/cargo/tests/testsuite/mock-std/library/sysroot/Cargo.toml new file mode 100644 index 000000000..615c894db --- /dev/null +++ b/src/tools/cargo/tests/testsuite/mock-std/library/sysroot/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "sysroot" +version = "0.1.0" +edition = "2018" + +[dependencies] +proc_macro = { path = "../proc_macro" } +std = { path = "../std" } +test = { path = "../test" } + +[features] +panic-unwind = [] +backtrace = [] +feature1 = ["std/feature1"] +default = [] diff --git a/src/tools/cargo/tests/testsuite/mock-std/library/sysroot/src/lib.rs b/src/tools/cargo/tests/testsuite/mock-std/library/sysroot/src/lib.rs new file mode 100644 index 000000000..7215576fc --- /dev/null +++ b/src/tools/cargo/tests/testsuite/mock-std/library/sysroot/src/lib.rs @@ -0,0 +1 @@ +// Intentionally left blank. diff --git a/src/tools/cargo/tests/testsuite/mock-std/library/test/Cargo.toml b/src/tools/cargo/tests/testsuite/mock-std/library/test/Cargo.toml index 299db7bfd..b9f51eda7 100644 --- a/src/tools/cargo/tests/testsuite/mock-std/library/test/Cargo.toml +++ b/src/tools/cargo/tests/testsuite/mock-std/library/test/Cargo.toml @@ -5,14 +5,7 @@ authors = ["Alex Crichton <alex@alexcrichton.com>"] edition = "2018" [dependencies] -proc_macro = { path = "../proc_macro" } std = { path = "../std" } panic_unwind = { path = "../panic_unwind" } compiler_builtins = { path = "../compiler_builtins" } registry-dep-using-std = { version = "*", features = ['mockbuild'] } - -[features] -panic-unwind = [] -backtrace = [] -feature1 = ["std/feature1"] -default = [] |