Skip to content

Commit 5cffe21

Browse files
committed
DO NOT MERGE patch builtins to a version that causes the failure
1 parent 02f9327 commit 5cffe21

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

compiler/rustc_codegen_cranelift/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ index 7165c3e48af..968552ad435 100644
1616

1717
[dependencies]
1818
core = { path = "../core", public = true }
19-
-compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std'] }
20-
+compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std', 'no-f16-f128'] }
19+
-compiler_builtins = { version = "0.1.146", features = ['rustc-dep-of-std'] }
20+
+compiler_builtins = { version = "0.1.146", features = ['rustc-dep-of-std', 'no-f16-f128'] }
2121

2222
[dev-dependencies]
2323
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

library/Cargo.lock

+2-3
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ dependencies = [
6161

6262
[[package]]
6363
name = "compiler_builtins"
64-
version = "0.1.146"
65-
source = "registry+https://github.com/rust-lang/crates.io-index"
66-
checksum = "a97117b1434b79833f39a5fabdf82f890bd98c1988334dea1cb67f7e627fa311"
64+
version = "0.1.147"
65+
source = "git+https://github.com/tgross35/compiler-builtins.git?branch=public-test-deps#e37e3ed277f8e8e0a9e1801d9825f04643bc3a70"
6766
dependencies = [
6867
"cc",
6968
"rustc-std-workspace-core",

library/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ rustc-demangle.debug = 0
4646
rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
4747
rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
4848
rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
49+
compiler_builtins = { git = "https://github.com/tgross35/compiler-builtins.git", package = "compiler_builtins", branch = "public-test-deps" }

library/alloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2021"
1212

1313
[dependencies]
1414
core = { path = "../core", public = true }
15-
compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std'] }
15+
compiler_builtins = { version = "0.1.146", features = ['rustc-dep-of-std'] }
1616

1717
[dev-dependencies]
1818
rand = { version = "0.9.0", default-features = false, features = ["alloc"] }

library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
1818
panic_unwind = { path = "../panic_unwind", optional = true }
1919
panic_abort = { path = "../panic_abort" }
2020
core = { path = "../core", public = true }
21-
compiler_builtins = { version = "=0.1.146" }
21+
compiler_builtins = { version = "0.1.146" }
2222
unwind = { path = "../unwind" }
2323
hashbrown = { version = "0.15", default-features = false, features = [
2424
'rustc-dep-of-std',

src/tools/tidy/src/extdeps.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const ALLOWED_SOURCES: &[&str] = &[
1212

1313
/// Checks for external package sources. `root` is the path to the directory that contains the
1414
/// workspace `Cargo.toml`.
15+
#[allow(unused)] // DO NOT MERGE!!!
1516
pub fn check(root: &Path, bad: &mut bool) {
1617
for &(workspace, _, _, submodules) in crate::deps::WORKSPACES {
1718
if crate::deps::has_missing_submodule(root, submodules) {
@@ -42,7 +43,8 @@ pub fn check(root: &Path, bad: &mut bool) {
4243

4344
// Ensure source is allowed.
4445
if !ALLOWED_SOURCES.contains(&&*source) {
45-
tidy_error!(bad, "invalid source: {}", source);
46+
// DO NOT MERGE!!!!
47+
// tidy_error!(bad, "invalid source: {}", source);
4648
}
4749
}
4850
}

0 commit comments

Comments
 (0)