Skip to content

Commit 84c5d20

Browse files
authored
Rollup merge of #145619 - joshtriplett:use-the-right-core, r=tgross35
`std_detect`: Use `rustc-std-workspace-*` to pull in `compiler-builtins` #145489 changed `std_detect` to no longer depend on `cfg-if`, which meant it no longer indirectly pulled in `rustc-std-workspace-core` via `cfg-if`. That caused it to no longer depend on `compiler-builtins`. Change `std_detect` to use `rustc-std-workspace-core` and `rustc-std-workspace-alloc`, to integrate with the rustc workspace. This also pulls in `compiler-builtins` via `rustc-std-workspace-core`. Closes: #145594
2 parents b0600b2 + 4c948bc commit 84c5d20

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

library/Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,9 @@ dependencies = [
336336
name = "std_detect"
337337
version = "0.1.5"
338338
dependencies = [
339-
"alloc",
340-
"core",
341339
"libc",
340+
"rustc-std-workspace-alloc",
341+
"rustc-std-workspace-core",
342342
]
343343

344344
[[package]]

library/std_detect/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ is-it-maintained-open-issues = { repository = "rust-lang/stdarch" }
2121
maintenance = { status = "experimental" }
2222

2323
[dependencies]
24-
core = { path = "../core" }
25-
alloc = { path = "../alloc" }
24+
core = { version = "1.0.0", package = 'rustc-std-workspace-core' }
25+
alloc = { version = "1.0.0", package = 'rustc-std-workspace-alloc' }
2626

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

0 commit comments

Comments
 (0)