diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-23 00:16:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-23 00:16:18 +0100 |
| commit | 1610bfb6af0bbd2d5bf737df89762310cc8cc4d2 (patch) | |
| tree | 08f0bec10587924a35bbbcb16079fc85fa188645 /library/alloc | |
| parent | 46420c96070b4c4bd8242f16d5806b8f26a57016 (diff) | |
| parent | 93925809eb2f4be76c7babcc7cdb73d10ef977bd (diff) | |
Rollup merge of #135501 - tgross35:stdlib-dependencies-private, r=bjorn3
Inject `compiler_builtins` during postprocessing and ensure it is made private Follow up of https://github.com/rust-lang/rust/pull/135278 Do the following: * Inject `compiler_builtins` during postprocessing, rather than injecting `extern crate compiler_builtins as _` into the AST * Do not make dependencies of `std` private by default (this was added in #135278) * Make sure sysroot crates correctly mark their dependencies private/public * Ensure that marking a dependency private makes its dependents private by default as well, unless otherwise specified * Do the `compiler_builtins` update that has been blocked on this There is more detail in the commit messages. This includes the changes I was working on in https://github.com/rust-lang/rust/pull/136226. try-job: test-various try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: i686-mingw-1 try-job: i686-mingw-2
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/Cargo.toml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml index c1d7f324f17..395cff13189 100644 --- a/library/alloc/Cargo.toml +++ b/library/alloc/Cargo.toml @@ -1,3 +1,5 @@ +cargo-features = ["public-dependency"] + [package] name = "alloc" version = "0.0.0" @@ -9,7 +11,7 @@ autobenches = false edition = "2021" [dependencies] -core = { path = "../core" } +core = { path = "../core", public = true } compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std'] } [dev-dependencies] |
