mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 16:24:46 +00:00
Update stdarch submodule (to before it switched to const generics)
This also includes a cherry-pick of
ec1461905b
and https://github.com/rust-lang/stdarch/pull/1108 to fix a build
failure.
It also adds a re-export of various macros to the crate root of libstd -
previously they would show up automatically because std_detect was defined
in the same crate.
This commit is contained in:
parent
b1b0a1597c
commit
1b0b7e95be
12
Cargo.lock
12
Cargo.lock
@ -5032,10 +5032,22 @@ dependencies = [
|
||||
"profiler_builtins",
|
||||
"rand 0.7.3",
|
||||
"rustc-demangle",
|
||||
"std_detect",
|
||||
"unwind",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "std_detect"
|
||||
version = "0.1.5"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
"compiler_builtins",
|
||||
"libc",
|
||||
"rustc-std-workspace-alloc",
|
||||
"rustc-std-workspace-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "string_cache"
|
||||
version = "0.8.0"
|
||||
|
@ -45,6 +45,8 @@ exclude = [
|
||||
# not all `Cargo.toml` files are available, so we exclude the `x` binary,
|
||||
# so it can be invoked before the current checkout is set up.
|
||||
"src/tools/x",
|
||||
# stdarch has its own Cargo workspace
|
||||
"library/stdarch",
|
||||
]
|
||||
|
||||
[profile.release.package.compiler_builtins]
|
||||
|
@ -21,6 +21,7 @@ compiler_builtins = { version = "0.1.39" }
|
||||
profiler_builtins = { path = "../profiler_builtins", optional = true }
|
||||
unwind = { path = "../unwind" }
|
||||
hashbrown = { version = "0.11", default-features = false, features = ['rustc-dep-of-std'] }
|
||||
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
|
||||
|
||||
# Dependencies of the `backtrace` crate
|
||||
addr2line = { version = "0.14.0", optional = true, default-features = false }
|
||||
@ -70,8 +71,8 @@ panic_immediate_abort = ["core/panic_immediate_abort"]
|
||||
|
||||
# Enable std_detect default features for stdarch/crates/std_detect:
|
||||
# https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.toml
|
||||
std_detect_file_io = []
|
||||
std_detect_dlsym_getauxval = []
|
||||
std_detect_file_io = ["std_detect/std_detect_file_io"]
|
||||
std_detect_dlsym_getauxval = ["std_detect/std_detect_dlsym_getauxval"]
|
||||
|
||||
[package.metadata.fortanix-sgx]
|
||||
# Maximum possible number of threads when testing
|
||||
|
@ -539,22 +539,16 @@ pub mod rt;
|
||||
#[allow(dead_code, unused_attributes)]
|
||||
mod backtrace_rs;
|
||||
|
||||
// Pull in the `std_detect` crate directly into libstd. The contents of
|
||||
// `std_detect` are in a different repository: rust-lang/stdarch.
|
||||
//
|
||||
// `std_detect` depends on libstd, but the contents of this module are
|
||||
// set up in such a way that directly pulling it here works such that the
|
||||
// crate uses the this crate as its libstd.
|
||||
#[path = "../../stdarch/crates/std_detect/src/mod.rs"]
|
||||
#[allow(missing_debug_implementations, missing_docs, dead_code)]
|
||||
#[unstable(feature = "stdsimd", issue = "48556")]
|
||||
#[cfg(not(test))]
|
||||
mod std_detect;
|
||||
|
||||
#[stable(feature = "simd_x86", since = "1.27.0")]
|
||||
pub use std_detect::is_x86_feature_detected;
|
||||
#[doc(hidden)]
|
||||
#[unstable(feature = "stdsimd", issue = "48556")]
|
||||
#[cfg(not(test))]
|
||||
pub use std_detect::detect;
|
||||
pub use std_detect::*;
|
||||
#[unstable(feature = "stdsimd", issue = "48556")]
|
||||
pub use std_detect::{
|
||||
is_aarch64_feature_detected, is_arm_feature_detected, is_mips64_feature_detected,
|
||||
is_mips_feature_detected, is_powerpc64_feature_detected, is_powerpc_feature_detected,
|
||||
};
|
||||
|
||||
// Re-export macros defined in libcore.
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 9c732a56f67f54d12a0b4fd99993154906c95ea6
|
||||
Subproject commit 19f5459dd0f89e466b7bcaa0f69ecca90f21a4d1
|
Loading…
Reference in New Issue
Block a user