Skip to content

Commit

Permalink
MSRV 1.64 (unicode-org#3622)
Browse files Browse the repository at this point in the history
  • Loading branch information
robertbastian authored Jul 5, 2023
1 parent 9fc965e commit 53a3ec3
Show file tree
Hide file tree
Showing 505 changed files with 810 additions and 827 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ concurrency:
jobs:

# ci-job-check & ci-job-features
# Running at MSRV (1.61)
# Running at MSRV (1.64)
msrv:
runs-on: ubuntu-latest
# Defined as a matrix so that features can start immediately, but
Expand Down Expand Up @@ -308,11 +308,11 @@ jobs:
run: rustup show

# Job-specific dependencies
- name: Set up Clang-14
- name: Set up Clang-15
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 14
sudo ./llvm.sh 15
- name: Install Node.js v16.18.0
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Our wider testsuite is organized as `ci-job-foo` make tasks corresponding to eac
- `cargo doc --no-deps --all-features`: Recreates API docs locally; any warning should be fixed since it will be treated as an error in CI.
- `cargo make ci-job-ffi`: Runs all of the FFI tests; mostly important if you're changing the FFI interface. This has several additional dependencies:
+ [`Diplomat`](https://github.com/rust-diplomat/diplomat) installed at the appropriate version: `cargo make diplomat-install`
+ `clang-14` and `lld-14` with the `gold` plugin (APT packages `llvm-14` and `lld-14`)
+ `clang-15` and `lld-15` with the `gold` plugin (APT packages `llvm-15` and `lld-15`)
- `cargo make ci-job-wasm`: Runs Rust-to-WASM tests. This also has a couple additional dependencies:
+ Node.js version 16.18.0. This may not the one offered by the package manager; get it from the NodeJS website or `nvm`.
+ [`Twiggy`](https://github.com/rustwasm/twiggy) (at least 0.7.0: `cargo install twiggy`
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extend = [
default_to_workspace = false

[env]
ICU4X_NIGHTLY_TOOLCHAIN = { value = "nightly-2022-04-18", condition = { env_not_set = ["ICU4X_NIGHTLY_TOOLCHAIN"] } }
ICU4X_NIGHTLY_TOOLCHAIN = { value = "nightly-2022-09-26", condition = { env_not_set = ["ICU4X_NIGHTLY_TOOLCHAIN"] } }
# To install a specific build of GN, set the ICU4X_GN_PACKAGE environment variable. Choices:
# https://chrome-infra-packages.appspot.com/p/gn/gn
# TODO: Choose the correct distribution of GN automatically.
Expand Down Expand Up @@ -61,8 +61,8 @@ description = "Run all tests for the CI 'check' job"
category = "ICU4X Development"
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.61 --profile minimal
exec --fail-on-error cargo +1.61 check --all-targets --all-features
exec --fail-on-error rustup install 1.64 --profile minimal
exec --fail-on-error cargo +1.64 check --all-targets --all-features
'''

[tasks.ci-job-test]
Expand Down Expand Up @@ -133,8 +133,8 @@ description = "Run all tests for the CI 'features' job"
category = "CI"
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.61 --profile minimal
exec --fail-on-error cargo +1.61 make check-all-features
exec --fail-on-error rustup install 1.64 --profile minimal
exec --fail-on-error cargo +1.64 make check-all-features
'''

[tasks.ci-job-fmt]
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# called LICENSE at the top level of the ICU4X source tree
# (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).

msrv = "1.61.0"
msrv = "1.64.0"
2 changes: 1 addition & 1 deletion components/calendar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
name = "icu_calendar"
description = "API for supporting various types of calendars"
version = "1.2.0"
rust-version = "1.61.0"
rust-version = "1.64.0"
authors = ["The ICU4X Project Developers"]
edition = "2021"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion components/calendar/data/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name = "icu_calendar_data"
version = "1.3.0"
description = "Data for the icu_calendar crate"
rust-version = "1.61.0"
rust-version = "1.64.0"
authors = ["The ICU4X Project Developers"]
edition = "2021"
readme = "README.md"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions components/calendar/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/collator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
name = "icu_collator"
description = "API for comparing strings according to language-dependent conventions"
version = "1.2.0"
rust-version = "1.61.0"
rust-version = "1.64.0"
authors = ["The ICU4X Project Developers"]
edition = "2021"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion components/collator/data/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name = "icu_collator_data"
version = "1.3.0"
description = "Data for the icu_collator crate"
rust-version = "1.61.0"
rust-version = "1.64.0"
authors = ["The ICU4X Project Developers"]
edition = "2021"
readme = "README.md"
Expand Down
Loading

0 comments on commit 53a3ec3

Please sign in to comment.