|
1 | 1 | --- a/build/config/clang/BUILD.gn |
2 | 2 | +++ b/build/config/clang/BUILD.gn |
3 | | -@@ -276,8 +276,6 @@ clang_lib("compiler_builtins") { |
| 3 | +@@ -287,8 +287,6 @@ clang_lib("compiler_builtins") { |
4 | 4 | } else { |
5 | 5 | assert(false, "unsupported target_platform=$target_platform") |
6 | 6 | } |
|
11 | 11 |
|
12 | 12 | --- a/build/config/rust.gni |
13 | 13 | +++ b/build/config/rust.gni |
14 | | -@@ -59,7 +59,7 @@ declare_args() { |
| 14 | +@@ -52,7 +52,7 @@ declare_args() { |
15 | 15 | # To use a custom toolchain instead, specify an absolute path to the root of |
16 | 16 | # a Rust sysroot, which will have a 'bin' directory and others. Commonly |
17 | 17 | # <home dir>/.rustup/toolchains/nightly-<something>-<something> |
|
20 | 20 |
|
21 | 21 | # Directory under which to find `bin/bindgen` (a `bin` directory containing |
22 | 22 | # the bindgen exectuable). |
23 | | -@@ -69,7 +69,7 @@ declare_args() { |
| 23 | +@@ -62,7 +62,7 @@ declare_args() { |
24 | 24 | # set this to the output of `rustc -V`. Changing this string will cause all |
25 | 25 | # Rust targets to be rebuilt, which allows you to update your toolchain and |
26 | 26 | # not break incremental builds. |
27 | 27 | - rustc_version = "" |
28 | | -+ rustc_version = "rustc 1.88.0-nightly (b8c54d635 2025-04-20)" |
| 28 | ++ rustc_version = "rustc 1.88.0-nightly (2e6882ac5 2025-05-05)" |
29 | 29 |
|
30 | 30 | # If you're using a Rust toolchain as specified by rust_sysroot_absolute, |
31 | 31 | # you can specify whether it supports nacl here. |
32 | 32 | --- a/third_party/rust/windows_aarch64_msvc/v0_52/BUILD.gn |
33 | 33 | +++ b/third_party/rust/windows_aarch64_msvc/v0_52/BUILD.gn |
34 | | -@@ -12,13 +12,13 @@ cargo_crate("lib") { |
35 | | - crate_name = "windows_aarch64_msvc" |
| 34 | +@@ -13,8 +13,8 @@ cargo_crate("lib") { |
36 | 35 | epoch = "0.52" |
| 36 | + enabled = is_win && current_cpu == "arm64" |
37 | 37 | crate_type = "rlib" |
38 | 38 | - crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/lib.rs" |
39 | 39 | - sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/lib.rs" ] |
|
42 | 42 | inputs = [] |
43 | 43 |
|
44 | 44 | build_native_rust_unit_tests = false |
45 | | - edition = "2021" |
46 | | -- cargo_pkg_version = "0.52.6" |
47 | | -+ cargo_pkg_version = "0.52.0" |
| 45 | +@@ -22,13 +22,13 @@ cargo_crate("lib") { |
48 | 46 | cargo_pkg_authors = "Microsoft" |
49 | 47 | cargo_pkg_name = "windows_aarch64_msvc" |
50 | 48 | cargo_pkg_description = "Import lib for Windows" |
51 | | -@@ -29,12 +29,12 @@ cargo_crate("lib") { |
52 | | - executable_configs += [ "//build/config/compiler:no_chromium_code" ] |
53 | | - proc_macro_configs -= [ "//build/config/compiler:chromium_code" ] |
54 | | - proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ] |
| 49 | +- cargo_pkg_version = "0.52.6" |
| 50 | ++ cargo_pkg_version = "0.52.0" |
| 51 | + |
| 52 | + allow_unsafe = false |
| 53 | + |
55 | 54 | - build_root = "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/build.rs" |
56 | 55 | - build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/build.rs" ] |
| 56 | +- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ] |
57 | 57 | + build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/build.rs" |
58 | 58 | + build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/build.rs" ] |
59 | | - rustflags = [ |
60 | | - "--cap-lints=allow", # Suppress all warnings in crates.io crates |
61 | | - ] |
62 | | -- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ] |
63 | 59 | + native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/aarch64_msvc/lib/windows.0.52.0.lib" ] |
64 | 60 |
|
65 | 61 | # Only for usage from third-party crates. Add the crate to |
66 | 62 | # //third_party/rust/chromium_crates_io/Cargo.toml to use |
67 | 63 | --- a/third_party/rust/windows_i686_msvc/v0_52/BUILD.gn |
68 | 64 | +++ b/third_party/rust/windows_i686_msvc/v0_52/BUILD.gn |
69 | | -@@ -12,13 +12,13 @@ cargo_crate("lib") { |
70 | | - crate_name = "windows_i686_msvc" |
| 65 | +@@ -13,8 +13,8 @@ cargo_crate("lib") { |
71 | 66 | epoch = "0.52" |
| 67 | + enabled = is_win && current_cpu == "x86" |
72 | 68 | crate_type = "rlib" |
73 | 69 | - crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/lib.rs" |
74 | 70 | - sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/lib.rs" ] |
|
77 | 73 | inputs = [] |
78 | 74 |
|
79 | 75 | build_native_rust_unit_tests = false |
80 | | - edition = "2021" |
81 | | -- cargo_pkg_version = "0.52.6" |
82 | | -+ cargo_pkg_version = "0.52.0" |
| 76 | +@@ -22,13 +22,13 @@ cargo_crate("lib") { |
83 | 77 | cargo_pkg_authors = "Microsoft" |
84 | 78 | cargo_pkg_name = "windows_i686_msvc" |
85 | 79 | cargo_pkg_description = "Import lib for Windows" |
86 | | -@@ -29,12 +29,12 @@ cargo_crate("lib") { |
87 | | - executable_configs += [ "//build/config/compiler:no_chromium_code" ] |
88 | | - proc_macro_configs -= [ "//build/config/compiler:chromium_code" ] |
89 | | - proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ] |
| 80 | +- cargo_pkg_version = "0.52.6" |
| 81 | ++ cargo_pkg_version = "0.52.0" |
| 82 | + |
| 83 | + allow_unsafe = false |
| 84 | + |
90 | 85 | - build_root = "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/build.rs" |
91 | 86 | - build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/build.rs" ] |
| 87 | +- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/../lib/windows.0.52.0.lib" ] |
92 | 88 | + build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/build.rs" |
93 | 89 | + build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/build.rs" ] |
94 | | - rustflags = [ |
95 | | - "--cap-lints=allow", # Suppress all warnings in crates.io crates |
96 | | - ] |
97 | | -- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-v0_52/src/../lib/windows.0.52.0.lib" ] |
98 | 90 | + native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/i686_msvc/lib/windows.0.52.0.lib" ] |
99 | 91 |
|
100 | 92 | # Only for usage from third-party crates. Add the crate to |
101 | 93 | # //third_party/rust/chromium_crates_io/Cargo.toml to use |
102 | 94 | --- a/third_party/rust/windows_x86_64_msvc/v0_52/BUILD.gn |
103 | 95 | +++ b/third_party/rust/windows_x86_64_msvc/v0_52/BUILD.gn |
104 | | -@@ -12,13 +12,13 @@ cargo_crate("lib") { |
105 | | - crate_name = "windows_x86_64_msvc" |
| 96 | +@@ -13,8 +13,8 @@ cargo_crate("lib") { |
106 | 97 | epoch = "0.52" |
| 98 | + enabled = is_win && current_cpu == "x64" |
107 | 99 | crate_type = "rlib" |
108 | 100 | - crate_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/lib.rs" |
109 | 101 | - sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/lib.rs" ] |
|
112 | 104 | inputs = [] |
113 | 105 |
|
114 | 106 | build_native_rust_unit_tests = false |
115 | | - edition = "2021" |
116 | | -- cargo_pkg_version = "0.52.6" |
117 | | -+ cargo_pkg_version = "0.52.0" |
| 107 | +@@ -22,13 +22,13 @@ cargo_crate("lib") { |
118 | 108 | cargo_pkg_authors = "Microsoft" |
119 | 109 | cargo_pkg_name = "windows_x86_64_msvc" |
120 | 110 | cargo_pkg_description = "Import lib for Windows" |
121 | | -@@ -29,12 +29,12 @@ cargo_crate("lib") { |
122 | | - executable_configs += [ "//build/config/compiler:no_chromium_code" ] |
123 | | - proc_macro_configs -= [ "//build/config/compiler:chromium_code" ] |
124 | | - proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ] |
| 111 | +- cargo_pkg_version = "0.52.6" |
| 112 | ++ cargo_pkg_version = "0.52.0" |
| 113 | + |
| 114 | + allow_unsafe = false |
| 115 | + |
125 | 116 | - build_root = "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/build.rs" |
126 | 117 | - build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/build.rs" ] |
| 118 | +- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ] |
127 | 119 | + build_root = "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/build.rs" |
128 | 120 | + build_sources = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/build.rs" ] |
129 | | - rustflags = [ |
130 | | - "--cap-lints=allow", # Suppress all warnings in crates.io crates |
131 | | - ] |
132 | | -- native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-v0_52/src/../lib/windows.0.52.0.lib" ] |
133 | 121 | + native_libs = [ "//third_party/rust/chromium_crates_io/vendor/windows-rs-0.52.0/crates/targets/x86_64_msvc/lib/windows.0.52.0.lib" ] |
134 | 122 |
|
135 | 123 | # Only for usage from third-party crates. Add the crate to |
|
0 commit comments