Skip to content

Commit 73ad49d

Browse files
Bump nightlies and LLVM (#6411)
1 parent dcee50a commit 73ad49d

File tree

14 files changed

+37
-31
lines changed

14 files changed

+37
-31
lines changed

.github/workflows/artifacts-build.yml

-2
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,6 @@ jobs:
267267
run: |
268268
npm -C ffi/npm ci
269269
npm -C tutorials/web-demo ci
270-
env:
271-
PINNED_CI_NIGHTLY: nightly-2024-07-23
272270
273271
- name: Run Webpack
274272
run: npm -C tutorials/web-demo run build

.github/workflows/build-test.yml

+10
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,11 @@ jobs:
280280
- name: Show the selected Rust toolchain
281281
run: rustup show
282282

283+
# Job-specific dependencies
284+
# TODO: Remove on 2025-05-05, when clang-19 is in ubuntu-latest (https://github.com/actions/runner-images/issues/11895)
285+
- name: Install LLD and Clang
286+
run: sudo apt-get install lld-19 clang-19
287+
283288
# Actual job
284289
- name: Run `cargo make ci-job-test-c`
285290
run: cargo make ci-job-test-c
@@ -310,6 +315,11 @@ jobs:
310315
- name: Show the selected Rust toolchain
311316
run: rustup show
312317

318+
# Job-specific dependencies
319+
# TODO: Remove on 2025-05-05, when clang-19 is in ubuntu-latest (https://github.com/actions/runner-images/issues/11895)
320+
- name: Install LLD
321+
run: sudo apt-get install lld-19
322+
313323
# Actual job
314324
- name: Run `cargo make ci-job-test-js`
315325
run: cargo make ci-job-test-js

.github/workflows/coverage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
3131
with:
32-
toolchain: nightly-2024-07-23
32+
toolchain: nightly-2024-09-01
3333
override: true
3434

3535
- run: cargo test --all-features --no-fail-fast

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Our wider testsuite is organized as `ci-job-foo` make tasks corresponding to eac
112112
<br/>
113113

114114
- `ci-job-test-c`: Runs all C/C++ FFI tests; mostly important if you're changing the FFI interface.
115-
+ Requires `clang-18` and `lld-18` with the `gold` plugin (APT packages `llvm-18` and `lld-18`).
115+
+ Requires `clang-19` and `lld-19` with the `gold` plugin (APT packages `llvm-19` and `lld-19`).
116116
- `ci-job-test-js`: Runs all JS/WASM/Node FFI tests; mostly important if you're changing the FFI interface.
117117
+ Requires Node.js version 16.18.0. This may not the one offered by the package manager; get it from the NodeJS website or `nvm`.
118118
- `ci-job-nostd`: Builds ICU4X for a `#[no_std]` target to verify that it's compatible.

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ default_to_workspace = false
1919
# The toolchain that CI is being run in. Allows tests to change under beta/nightly.
2020
CI_TOOLCHAIN = { value = "pinned-stable", condition = { env_not_set = ["CI_TOOLCHAIN"]}}
2121
# The pinned nightly toolchain for jobs that require a nightly compiler.
22-
PINNED_CI_NIGHTLY = { value = "nightly-2024-07-23", condition = { env_not_set = ["PINNED_CI_NIGHTLY"] } }
22+
PINNED_CI_NIGHTLY = { value = "nightly-2025-02-17", condition = { env_not_set = ["PINNED_CI_NIGHTLY"] } }
2323

2424
[tasks.quick]
2525
description = "Run quick version of all lints and builds (useful before pushing to GitHub)"

tools/make/diplomat-coverage/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2021"
1212
diplomat_core = { workspace = true }
1313
elsa = { workspace = true }
1414
lazy_static = "1"
15-
rustdoc-types = "0.28"
15+
rustdoc-types = "0.36"
1616
serde_json = { workspace = true }
1717
syn-inline-mod = "0.6.0"
1818

tools/make/diplomat-coverage/src/main.rs

+9-11
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
9999
if CRATES.get(krate).is_none() {
100100
eprintln!("Parsing crate {krate}");
101101
std::process::Command::new("rustup")
102-
.args(["install", "nightly-2024-07-23"])
102+
.args(["install", "nightly-2025-02-17"])
103103
.output()
104104
.expect("failed to install nightly");
105105
let output = std::process::Command::new("rustup")
106106
.args([
107107
"run",
108-
"nightly-2024-07-23",
108+
"nightly-2025-02-17",
109109
"cargo",
110110
"rustdoc",
111111
"-p",
@@ -186,8 +186,8 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
186186
return;
187187
}
188188
match &item.inner {
189-
ItemEnum::Import(import) => {
190-
if !import.glob {
189+
ItemEnum::Use(import) => {
190+
if !import.is_glob {
191191
path.push(import.name.clone());
192192
}
193193

@@ -235,7 +235,7 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
235235
.iter()
236236
.map(|id| &external_crate.index[id])
237237
.find(|item| match &item.inner {
238-
ItemEnum::Import(import) => {
238+
ItemEnum::Use(import) => {
239239
if import.name.as_str() == segment {
240240
path.pop();
241241
true
@@ -272,11 +272,10 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
272272
if let ItemEnum::Impl(inner) = &krate.index[id].inner {
273273
let mut trait_name = None;
274274
if let Some(path) = &inner.trait_ {
275-
let name = &path.name;
276-
if IGNORED_TRAITS.contains(name.as_str()) {
275+
if IGNORED_TRAITS.contains(path.path.as_str()) {
277276
continue;
278277
}
279-
trait_name = Some(&*path.name);
278+
trait_name = Some(path.path.as_str());
280279
}
281280
for id in &inner.items {
282281
recurse(
@@ -302,11 +301,10 @@ fn collect_public_types(krate: &str) -> impl Iterator<Item = (Vec<String>, ast::
302301
if let ItemEnum::Impl(inner) = &krate.index[id].inner {
303302
let mut trait_name = None;
304303
if let Some(path) = &inner.trait_ {
305-
let name = &path.name;
306-
if IGNORED_TRAITS.contains(name.as_str()) {
304+
if IGNORED_TRAITS.contains(path.path.as_str()) {
307305
continue;
308306
}
309-
trait_name = Some(&*path.name);
307+
trait_name = Some(path.path.as_str());
310308
}
311309
for id in &inner.items {
312310
recurse(

tutorials/c-tiny/README.md

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tutorials/c-tiny/fixeddecimal/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ ALL_RUST_SRC = $(wildcard ../../../components/**/*.rs) $(wildcard ../../../provi
2222
$(ALL_HEADERS):
2323

2424
GCC := gcc
25-
CLANG := clang-18
26-
LLD := lld-18
27-
LLVM_COMPATIBLE_NIGHTLY = "nightly-2024-07-01"
25+
CLANG := clang-19
26+
LLD := lld-19
27+
LLVM_COMPATIBLE_NIGHTLY = "nightly-2025-02-17"
2828

2929

3030
target/release/icu4x-datagen: $(ALL_RUST_SRC)

tutorials/c-tiny/segmenter/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ ALL_RUST_SRC = $(wildcard ../../../components/**/*.rs) $(wildcard ../../../provi
2222
$(ALL_HEADERS):
2323

2424
GCC := gcc
25-
CLANG := clang-18
26-
LLD := lld-18
27-
LLVM_COMPATIBLE_NIGHTLY = "nightly-2024-07-01"
25+
CLANG := clang-19
26+
LLD := lld-19
27+
LLVM_COMPATIBLE_NIGHTLY = "nightly-2025-02-17"
2828

2929

3030
target-normal/release/libicu_capi.a:

tutorials/js-tiny/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ICU_CAPI := $(shell cargo metadata --format-version 1 | jq '.packages[] | select
99
HEADERS := ${ICU_CAPI}/bindings/js
1010
ALL_HEADERS := $(wildcard ${HEADERS}/*)
1111

12-
LLVM_COMPATIBLE_NIGHTLY ?= "nightly-2024-07-01"
12+
LLVM_COMPATIBLE_NIGHTLY ?= "nightly-2025-02-17"
1313

1414
$(ALL_HEADERS):
1515

tutorials/js-tiny/ld.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def main():
3232
else:
3333
new_argv += [arg]
3434
is_export = False
35-
result = subprocess.run(["lld-18"] + new_argv, stdout=sys.stdout, stderr=sys.stderr)
35+
result = subprocess.run(["lld-19"] + new_argv, stdout=sys.stdout, stderr=sys.stderr)
3636
return result.returncode
3737

3838
if __name__ == "__main__":

tutorials/rust/buffer/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
export CARGO_TARGET_DIR ?= target
66

7-
PINNED_CI_NIGHTLY = "nightly-2024-07-23"
7+
PINNED_CI_NIGHTLY = "nightly-2025-02-17"
88

99
all: buffer_data.postcard bin/tutorial_buffer.wasm
1010

0 commit comments

Comments
 (0)