Skip to content

Commit 4d4edac

Browse files
committed
Update to Rust 1.89.0
1 parent 8e367d3 commit 4d4edac

File tree

14 files changed

+1280
-837
lines changed

14 files changed

+1280
-837
lines changed

BUCK

Lines changed: 1083 additions & 653 deletions
Large diffs are not rendered by default.

Cargo.lock

Lines changed: 176 additions & 108 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ rustc-main = { path = "rust/compiler/rustc", artifact = ["bin"], features = ["ll
2525
rustdoc-tool = { path = "rust/src/tools/rustdoc", artifact = ["bin"] }
2626

2727
[patch.crates-io]
28+
compiler_builtins = { path = "rust/library/compiler-builtins/compiler-builtins" }
2829
rustc-std-workspace-alloc = { path = "rust/library/rustc-std-workspace-alloc" }
2930
rustc-std-workspace-core = { path = "rust/library/rustc-std-workspace-core" }
3031
rustc-std-workspace-std = { path = "rust/library/rustc-std-workspace-std" }

allocator/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ alias(
3232
"//constraints:library": None,
3333
"//constraints:compiler": "//:allocator-api2",
3434
}),
35-
default_target_platform = "//platforms/stage1:library",
35+
default_target_platform = "//platforms/stage2:library",
3636
visibility = ["//:"],
3737
)

defs.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def rust_bootstrap_binary(
2323
extra_rustc_flags = []
2424

2525
if crate_root.startswith("rust/library/"):
26-
default_target_platform = "//platforms/stage1:library-build-script"
26+
default_target_platform = "//platforms/stage2:library-build-script"
2727
elif crate_root.startswith("rust/compiler/") or crate_root.startswith("rust/src/"):
2828
default_target_platform = "//platforms/stage1:compiler"
2929
else:
@@ -72,7 +72,7 @@ def rust_bootstrap_library(
7272
extra_srcs = []
7373

7474
if crate_root.startswith("rust/library/"):
75-
default_target_platform = "//platforms/stage1:library"
75+
default_target_platform = "//platforms/stage2:library"
7676
elif crate_root.startswith("rust/compiler/") or crate_root.startswith("rust/src/"):
7777
default_target_platform = "//platforms/stage1:compiler"
7878
messages_ftl = glob(["rust/compiler/{}/messages.ftl".format(crate)])

fixups/compiler_builtins/fixups.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
extra_srcs = ["../libm/src/math/**/*.rs"]
2+
13
rustc_flags = [
24
# Port of Cargo change: https://github.com/rust-lang/rust/pull/73136/files
35
#

fixups/rustc_proc_macro/fixups.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
extra_srcs = ["../../library/proc_macro/**/*.rs"]
2+
3+
# This is a compiler crate despite having source code located in the library
4+
# directory.
5+
target_compatible_with = ["//constraints:compiler"]

fixups/rustdoc/fixups.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript.run = true
22
cargo_env = ["CARGO_MANIFEST_DIR"]
33
extra_deps = [
4-
"toolchains//rust:sysroot[test]",
54
":pulldown-cmark-0.11.3",
65
":rustc_abi-0.0.0",
76
":rustc_ast-0.0.0",

platforms/BUCK

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ execution_platforms(
1414
name = "execution",
1515
platforms = [
1616
":host",
17-
"//platforms/stage1:library",
18-
"//platforms/stage1:library-build-script",
1917
"//platforms/stage1:compiler",
2018
"//platforms/stage1:compiler-build-script",
2119
"//platforms/stage2:library",

platforms/stage1/BUCK

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
load("//platforms:defs.bzl", "platform")
22

3-
platform(
4-
name = "library",
5-
base = "//platforms:host",
6-
constraint_values = [
7-
"//constraints:build-script=false",
8-
"//constraints:library",
9-
"//constraints:opt-level=3",
10-
"//constraints:stage1",
11-
],
12-
visibility = ["PUBLIC"],
13-
)
14-
15-
platform(
16-
name = "library-build-script",
17-
base = ":library",
18-
constraint_values = [
19-
"//constraints:build-script=true",
20-
"//constraints:opt-level=0",
21-
],
22-
visibility = ["PUBLIC"],
23-
)
24-
253
platform(
264
name = "compiler",
275
base = "//platforms:host",

0 commit comments

Comments
 (0)