Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fab2460

Browse files
authoredFeb 24, 2025··
Merge branch 'rust-lang:master' into zero-cost-rc-arc-deref
2 parents ec93cba + f43e549 commit fab2460

File tree

133 files changed

+1233
-1775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+1233
-1775
lines changed
 

‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -4571,6 +4571,7 @@ dependencies = [
45714571
"itertools",
45724572
"minifier",
45734573
"pulldown-cmark 0.9.6",
4574+
"pulldown-cmark-escape",
45744575
"regex",
45754576
"rinja",
45764577
"rustdoc-json-types",

‎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.147", features = ['rustc-dep-of-std'] }
20+
+compiler_builtins = { version = "=0.1.147", features = ['rustc-dep-of-std', 'no-f16-f128'] }
2121

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

0 commit comments

Comments
 (0)
Please sign in to comment.