From 524c1d1db1db83598a7f21a8366e6c2e6deca21d Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 3 Oct 2024 10:25:18 -0700 Subject: [PATCH] Update pinned llvm-compat nightly to 2024-05-01 --- CONTRIBUTING.md | 2 +- tools/make/diplomat-coverage/Cargo.toml | 2 +- tools/make/diplomat-coverage/src/main.rs | 6 +++--- tutorials/c-tiny/fixeddecimal/Makefile | 6 +++--- tutorials/c-tiny/segmenter/Makefile | 6 +++--- tutorials/js-tiny/Makefile | 2 +- tutorials/js-tiny/ld.py | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a3ba62ce984..5c4df2fa742 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -112,7 +112,7 @@ Our wider testsuite is organized as `ci-job-foo` make tasks corresponding to eac
- `ci-job-test-c`: Runs all C/C++ FFI tests; mostly important if you're changing the FFI interface. - + Requires `clang-16` and `lld-16` with the `gold` plugin (APT packages `llvm-16` and `lld-16`). + + Requires `clang-18` and `lld-18` with the `gold` plugin (APT packages `llvm-18` and `lld-18`). - `ci-job-test-js`: Runs all JS/WASM/Node FFI tests; mostly important if you're changing the FFI interface. + 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`. - `ci-job-nostd`: Builds ICU4X for a `#[no_std]` target to verify that it's compatible. diff --git a/tools/make/diplomat-coverage/Cargo.toml b/tools/make/diplomat-coverage/Cargo.toml index 96c67f7762a..32b80d26c46 100644 --- a/tools/make/diplomat-coverage/Cargo.toml +++ b/tools/make/diplomat-coverage/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" diplomat_core = { workspace = true } elsa = { workspace = true } lazy_static = "1" -rustdoc-types = "0.22" +rustdoc-types = "0.25" serde_json = { workspace = true } syn-inline-mod = "0.6.0" diff --git a/tools/make/diplomat-coverage/src/main.rs b/tools/make/diplomat-coverage/src/main.rs index 59cf05fafcb..1086211f6e6 100644 --- a/tools/make/diplomat-coverage/src/main.rs +++ b/tools/make/diplomat-coverage/src/main.rs @@ -99,13 +99,13 @@ fn collect_public_types(krate: &str) -> impl Iterator, ast:: if CRATES.get(krate).is_none() { eprintln!("Parsing crate {krate}"); std::process::Command::new("rustup") - .args(["install", "nightly-2023-08-08"]) + .args(["install", "nightly-2024-05-01"]) .output() .expect("failed to install nightly"); let output = std::process::Command::new("rustup") .args([ "run", - "nightly-2023-08-08", + "nightly-2024-05-01", "cargo", "rustdoc", "-Zsparse-registry", @@ -357,7 +357,7 @@ fn collect_public_types(krate: &str) -> impl Iterator, ast:: ItemEnum::Macro(_) => { insert_ty(types, path, ast::DocType::Macro); } - ItemEnum::Typedef(_) => { + ItemEnum::TypeAlias(_) => { insert_ty(types, path, ast::DocType::Typedef); } ItemEnum::Variant(_) => { diff --git a/tutorials/c-tiny/fixeddecimal/Makefile b/tutorials/c-tiny/fixeddecimal/Makefile index 59125406098..eec29dffeea 100644 --- a/tutorials/c-tiny/fixeddecimal/Makefile +++ b/tutorials/c-tiny/fixeddecimal/Makefile @@ -15,9 +15,9 @@ ALL_HEADERS := $(wildcard ${HEADERS}/*) $(ALL_HEADERS): GCC := gcc -CLANG := clang-16 -LLD := lld-16 -LLVM_COMPATIBLE_NIGHTLY = "nightly-2023-08-08" +CLANG := clang-18 +LLD := lld-18 +LLVM_COMPATIBLE_NIGHTLY = "nightly-2024-05-01" baked_data/macros.rs: cargo install --path ../../../provider/icu4x-datagen --root target diff --git a/tutorials/c-tiny/segmenter/Makefile b/tutorials/c-tiny/segmenter/Makefile index abd23714b14..c6726f44301 100644 --- a/tutorials/c-tiny/segmenter/Makefile +++ b/tutorials/c-tiny/segmenter/Makefile @@ -15,9 +15,9 @@ ALL_HEADERS := $(wildcard ${HEADERS}/*) $(ALL_HEADERS): GCC := gcc -CLANG := clang-16 -LLD := lld-16 -LLVM_COMPATIBLE_NIGHTLY = "nightly-2023-08-08" +CLANG := clang-18 +LLD := lld-18 +LLVM_COMPATIBLE_NIGHTLY = "nightly-2024-05-01" target/debug/libicu_capi.a: FORCE cargo rustc -p icu_capi --crate-type staticlib --no-default-features --features icu_capi/compiled_data,icu_capi/segmenter,icu_capi/std diff --git a/tutorials/js-tiny/Makefile b/tutorials/js-tiny/Makefile index eb8f28e18eb..3f11ccf5073 100755 --- a/tutorials/js-tiny/Makefile +++ b/tutorials/js-tiny/Makefile @@ -9,7 +9,7 @@ ICU_CAPI := $(shell cargo metadata --format-version 1 | jq '.packages[] | select HEADERS := ${ICU_CAPI}/bindings/js ALL_HEADERS := $(wildcard ${HEADERS}/*) -LLVM_COMPATIBLE_NIGHTLY ?= "nightly-2023-08-08" +LLVM_COMPATIBLE_NIGHTLY ?= "nightly-2024-05-01" $(ALL_HEADERS): diff --git a/tutorials/js-tiny/ld.py b/tutorials/js-tiny/ld.py index daf12fd79ce..5f2c3b99203 100755 --- a/tutorials/js-tiny/ld.py +++ b/tutorials/js-tiny/ld.py @@ -32,7 +32,7 @@ def main(): else: new_argv += [arg] is_export = False - result = subprocess.run(["lld-16"] + new_argv, stdout=sys.stdout, stderr=sys.stderr) + result = subprocess.run(["lld-18"] + new_argv, stdout=sys.stdout, stderr=sys.stderr) return result.returncode if __name__ == "__main__":