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.

Sign up for GitHub

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

1.72 toolchain, 1.66 MSRV #3973

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b5b7f7
bump
robertbastian Aug 30, 2023
cc036fa
fmt
robertbastian Aug 30, 2023
3d28943
datagen
robertbastian Aug 30, 2023
7a7a84b
clippy --fix
robertbastian Aug 30, 2023
19625cf
manual clippy fixes
robertbastian Aug 30, 2023
4e07bef
vecs
robertbastian Aug 30, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
12 changes: 7 additions & 5 deletions provider/datagen/src/baked_exporter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ macro_rules! move_out {
// TokenStream isn't Send/Sync
type SyncTokenStream = String;

const MSRV: &str = std::env!("CARGO_PKG_RUST_VERSION");

/// Options for configuring the output of [`BakedExporter`].
#[non_exhaustive]
#[derive(Debug)]
Expand Down Expand Up @@ -328,14 +330,14 @@ impl DataExporter for BakedExporter {
let bake = payload.tokenize(&self.dependencies);

self.write_impl_macro(quote! {
#[clippy::msrv = "1.65"]
#[clippy::msrv = #MSRV]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: clever

impl $provider {
// Exposing singleton structs as consts allows us to get rid of fallibility
#[doc(hidden)]
pub const #singleton_ident: &'static <#marker as icu_provider::DataMarker>::Yokeable = &#bake;
}

#[clippy::msrv = "1.65"]
#[clippy::msrv = #MSRV]
impl icu_provider::DataProvider<#marker> for $provider {
fn load(
&self,
Expand Down Expand Up @@ -534,7 +536,7 @@ impl BakedExporter {

self.write_impl_macro(
quote! {
#[clippy::msrv = "1.65"]
#[clippy::msrv = #MSRV]
impl icu_provider::DataProvider<#marker> for $provider {
fn load(
&self,
Expand Down Expand Up @@ -651,7 +653,7 @@ impl BakedExporter {
#[macro_export]
macro_rules! __impl_any_provider {
($provider:path) => {
#[clippy::msrv = "1.65"]
#[clippy::msrv = #MSRV]
impl icu_provider::AnyProvider for $provider {
fn load_any(&self, key: icu_provider::DataKey, req: icu_provider::DataRequest) -> Result<icu_provider::AnyResponse, icu_provider::DataError> {
match key.hashed() {
Expand All @@ -669,7 +671,7 @@ impl BakedExporter {
#[doc(inline)]
pub use __impl_any_provider as impl_any_provider;

#[clippy::msrv = "1.65"]
#[clippy::msrv = #MSRV]
pub struct BakedDataProvider;
impl_data_provider!(BakedDataProvider);
},
Expand Down
2 changes: 1 addition & 1 deletion provider/testdata/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
name = "icu_testdata"
description = "Pre-built test data for ICU4X"
version = "1.2.0"
rust-version = "1.65.0"
rust-version = "1.66.0"
authors = ["The ICU4X Project Developers"]
edition = "2021"
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

[toolchain]
# Version updated on 2023-07-14
channel = "1.71"
channel = "1.72"