diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-09-30 20:56:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 20:56:10 +0200 |
| commit | 87387fd23ead4ca4d2dcc3ea6e4e6dbc925d6914 (patch) | |
| tree | 7717a4f3fd3afa9f881d5392484110e97f0c38b5 | |
| parent | a4dc8dae02ad78499c0c176227eb39071e1d0dd2 (diff) | |
| parent | 37f795697c7d0530deb0c5c94a8f99aab587e2e4 (diff) | |
| download | rust-87387fd23ead4ca4d2dcc3ea6e4e6dbc925d6914.tar.gz rust-87387fd23ead4ca4d2dcc3ea6e4e6dbc925d6914.zip | |
Rollup merge of #77284 - josephlr:mem, r=Mark-Simulacrum
library: Forward compiler-builtins "mem" feature This fixes https://github.com/rust-lang/wg-cargo-std-aware/issues/53 Now users will be able to do: ``` cargo build -Zbuild-std=core -Zbuild-std-features=compiler-builtins-mem ``` and correctly get the Rust implemenations for `memcpy` and friends. Signed-off-by: Joe Richey <joerichey@google.com>
| -rw-r--r-- | library/std/Cargo.toml | 1 | ||||
| -rw-r--r-- | library/test/Cargo.toml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 01babeffd98..b27b056086a 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -59,6 +59,7 @@ gimli-symbolize = [] panic-unwind = ["panic_unwind"] profiler = ["profiler_builtins"] compiler-builtins-c = ["alloc/compiler-builtins-c"] +compiler-builtins-mem = ["alloc/compiler-builtins-mem"] llvm-libunwind = ["unwind/llvm-libunwind"] # Make panics and failed asserts immediately abort without formatting any message diff --git a/library/test/Cargo.toml b/library/test/Cargo.toml index 7b76dc83aa2..e44c7811135 100644 --- a/library/test/Cargo.toml +++ b/library/test/Cargo.toml @@ -25,6 +25,7 @@ proc_macro = { path = "../proc_macro" } default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind"] backtrace = ["std/backtrace"] compiler-builtins-c = ["std/compiler-builtins-c"] +compiler-builtins-mem = ["std/compiler-builtins-mem"] llvm-libunwind = ["std/llvm-libunwind"] panic-unwind = ["std/panic_unwind"] panic_immediate_abort = ["std/panic_immediate_abort"] |