diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2025-08-20 00:45:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-20 00:45:58 -0400 |
| commit | 84c5d20fe724b9bd12d2fa24dfa250d7a548949d (patch) | |
| tree | 031c8925654ee48c54db9b8e955f3b959caedabf | |
| parent | b0600b23268141fd00c5e2f89106fe15a506855b (diff) | |
| parent | 4c948bc3324002aa9519a0fe20d67f951dd6ae25 (diff) | |
| download | rust-84c5d20fe724b9bd12d2fa24dfa250d7a548949d.tar.gz rust-84c5d20fe724b9bd12d2fa24dfa250d7a548949d.zip | |
Rollup merge of #145619 - joshtriplett:use-the-right-core, r=tgross35
`std_detect`: Use `rustc-std-workspace-*` to pull in `compiler-builtins` https://github.com/rust-lang/rust/pull/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: https://github.com/rust-lang/rust/issues/145594
| -rw-r--r-- | library/Cargo.lock | 4 | ||||
| -rw-r--r-- | library/std_detect/Cargo.toml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/Cargo.lock b/library/Cargo.lock index 656576d2d8e..418a5f78397 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -336,9 +336,9 @@ dependencies = [ name = "std_detect" version = "0.1.5" dependencies = [ - "alloc", - "core", "libc", + "rustc-std-workspace-alloc", + "rustc-std-workspace-core", ] [[package]] diff --git a/library/std_detect/Cargo.toml b/library/std_detect/Cargo.toml index 33e6617c381..2739bb59230 100644 --- a/library/std_detect/Cargo.toml +++ b/library/std_detect/Cargo.toml @@ -21,8 +21,8 @@ is-it-maintained-open-issues = { repository = "rust-lang/stdarch" } maintenance = { status = "experimental" } [dependencies] -core = { path = "../core" } -alloc = { path = "../alloc" } +core = { version = "1.0.0", package = 'rustc-std-workspace-core' } +alloc = { version = "1.0.0", package = 'rustc-std-workspace-alloc' } [target.'cfg(not(windows))'.dependencies] libc = { version = "0.2.0", optional = true, default-features = false } |