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 | 8b0f63244cbfe73dcbcc09058c672df0b7bbb75a (patch) | |
| tree | 4957e94a98d95b1c6e14f1d66904663db39c2089 | |
| parent | 410a68a907b14db7eaa2152eccbbcef9ae357f7c (diff) | |
| parent | 8622c818e2474b1973cce49b11c4826c2d3f93d9 (diff) | |
| download | rust-8b0f63244cbfe73dcbcc09058c672df0b7bbb75a.tar.gz rust-8b0f63244cbfe73dcbcc09058c672df0b7bbb75a.zip | |
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
| -rw-r--r-- | patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch b/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch index e3a9512dda9..eb1fc4b0ad5 100644 --- a/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch +++ b/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch @@ -15,7 +15,7 @@ index 7165c3e48af..968552ad435 100644 edition = "2021" [dependencies] - core = { path = "../core" } + core = { path = "../core", public = true } -compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std'] } +compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std', 'no-f16-f128'] } |