Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.72 toolchain, 1.66 MSRV #3973

Merged
merged 6 commits into from
Aug 30, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 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.65)
# Running at MSRV (1.66)
msrv:
runs-on: ubuntu-latest
# Defined as a matrix so that features can start immediately, but
Expand Down Expand Up @@ -580,7 +580,6 @@ jobs:

# ci-job-fmt
fmt:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ exclude = [

[workspace.package]
version = "1.2.0"
rust-version = "1.65"
rust-version = "1.66"
authors = ["The ICU4X Project Developers"]
edition = "2021"
repository = "https://github.com/unicode-org/icu4x"
Expand Down
16 changes: 8 additions & 8 deletions Makefile.toml
Original file line number Diff line number Diff line change
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.65 --profile minimal
exec --fail-on-error cargo +1.65 check --all-targets --all-features
exec --fail-on-error rustup install 1.66 --profile minimal
exec --fail-on-error cargo +1.66 check --all-targets --all-features
'''

[tasks.ci-job-test]
Expand Down Expand Up @@ -149,26 +149,26 @@ description = "Run all tests for the CI 'msrv-features-1' job"
category = "CI"
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.65 --profile minimal
exec --fail-on-error cargo +1.65 make check-all-features-chunked 1
exec --fail-on-error rustup install 1.66 --profile minimal
exec --fail-on-error cargo +1.66 make check-all-features-chunked 1
'''

[tasks.ci-job-msrv-features-2]
description = "Run all tests for the CI 'msrv-features-2' job"
category = "CI"
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.65 --profile minimal
exec --fail-on-error cargo +1.65 make check-all-features-chunked 2
exec --fail-on-error rustup install 1.66 --profile minimal
exec --fail-on-error cargo +1.66 make check-all-features-chunked 2
'''

[tasks.ci-job-msrv-features-3]
description = "Run all tests for the CI 'msrv-features-3' job"
category = "CI"
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.65 --profile minimal
exec --fail-on-error cargo +1.65 make check-all-features-chunked 3
exec --fail-on-error rustup install 1.66 --profile minimal
exec --fail-on-error cargo +1.66 make check-all-features-chunked 3
'''

[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.65.0"
msrv = "1.66.0"

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.

4 changes: 2 additions & 2 deletions components/calendar/src/persian.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ pub struct PersianDateInner(ArithmeticDate<Persian>);
impl CalendarArithmetic for Persian {
fn month_days(year: i32, month: u8) -> u8 {
match month {
1 | 2 | 3 | 4 | 5 | 6 => 31,
7 | 8 | 9 | 10 | 11 => 30,
1..=6 => 31,
7..=11 => 30,
12 if Self::is_leap_year(year) => 30,
12 => 29,
_ => 0,
Expand Down

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

Large diffs are not rendered by default.

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

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

8 changes: 6 additions & 2 deletions components/casemap/src/titlecase.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ impl TitlecaseMapper<CaseMapper> {
{
let cm = CaseMapper::try_new_unstable(provider)?;
let gc = icu_properties::maps::load_general_category(provider).map_err(|e| {
let PropertiesError::PropDataLoad(e) = e else { unreachable!() };
let PropertiesError::PropDataLoad(e) = e else {
unreachable!()
};
e
})?;
Ok(Self { cm, gc })
Expand Down Expand Up @@ -250,7 +252,9 @@ impl<CM: AsRef<CaseMapper>> TitlecaseMapper<CM> {
P: DataProvider<CaseMapV1Marker> + DataProvider<GeneralCategoryV1Marker> + ?Sized,
{
let gc = icu_properties::maps::load_general_category(provider).map_err(|e| {
let PropertiesError::PropDataLoad(e) = e else { unreachable!() };
let PropertiesError::PropDataLoad(e) = e else {
unreachable!()
};
e
})?;
Ok(Self { cm: casemapper, gc })
Expand Down
Loading