Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f1a4070

Browse files
Auto merge of #143412 - Kobzol:std-detect-in-stdlib, r=<try>
Move `std_detect` into stdlib try-job: armhf-gnu try-job: arm-android
2 parents 2e53675 + 9a1179c commit f1a4070

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+377
-817
lines changed

‎library/Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,10 @@ dependencies = [
340340
name = "std_detect"
341341
version = "0.1.5"
342342
dependencies = [
343+
"alloc",
343344
"cfg-if",
345+
"core",
344346
"libc",
345-
"rustc-std-workspace-alloc",
346-
"rustc-std-workspace-core",
347347
]
348348

349349
[[package]]

‎library/std/Cargo.toml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ unwind = { path = "../unwind" }
2323
hashbrown = { version = "0.15", default-features = false, features = [
2424
'rustc-dep-of-std',
2525
] }
26-
std_detect = { path = "../stdarch/crates/std_detect", public = true, default-features = false, features = [
27-
'rustc-dep-of-std',
28-
] }
26+
std_detect = { path = "../std_detect", public = true }
2927

3028
# Dependencies of the `backtrace` crate
3129
rustc-demangle = { version = "0.1.24", features = ['rustc-dep-of-std'] }
@@ -118,8 +116,7 @@ optimize_for_size = ["core/optimize_for_size", "alloc/optimize_for_size"]
118116
debug_refcell = ["core/debug_refcell"]
119117

120118

121-
# Enable std_detect default features for stdarch/crates/std_detect:
122-
# https://github.com/rust-lang/stdarch/blob/master/crates/std_detect/Cargo.toml
119+
# Enable std_detect features:
123120
std_detect_file_io = ["std_detect/std_detect_file_io"]
124121
std_detect_dlsym_getauxval = ["std_detect/std_detect_dlsym_getauxval"]
125122

‎library/stdarch/crates/std_detect/Cargo.toml‎ renamed to ‎library/std_detect/Cargo.toml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,14 @@ maintenance = { status = "experimental" }
2222

2323
[dependencies]
2424
cfg-if = "1.0.0"
25-
26-
# When built as part of libstd
27-
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
28-
alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-alloc" }
25+
core = { path = "../core" }
26+
alloc = { path = "../alloc" }
2927

3028
[target.'cfg(not(windows))'.dependencies]
3129
libc = { version = "0.2.0", optional = true, default-features = false }
3230

3331
[features]
34-
default = ["std_detect_dlsym_getauxval", "std_detect_file_io"]
32+
default = []
3533
std_detect_file_io = [ "libc" ]
3634
std_detect_dlsym_getauxval = [ "libc" ]
3735
std_detect_env_override = [ "libc" ]
38-
rustc-dep-of-std = [
39-
"core",
40-
"alloc",
41-
]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /