Skip to content

Commit

Permalink
Bump MSRV to 1.80 (#5934)
Browse files Browse the repository at this point in the history
<!--
Thank you for your pull request to ICU4X!

Reminder: try to use [Conventional
Comments](https://conventionalcomments.org/) to make comments clearer.

Please see
https://github.com/unicode-org/icu4x/blob/main/CONTRIBUTING.md for
general
information on contributing to ICU4X.
-->
  • Loading branch information
Manishearth authored Jan 9, 2025
1 parent 9ef8e64 commit 617eb42
Show file tree
Hide file tree
Showing 578 changed files with 3,358 additions and 3,358 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Our wider testsuite is organized as `ci-job-foo` make tasks corresponding to eac
<br/>

- `ci-job-test-c`: Runs all C/C++ FFI tests; mostly important if you're changing the FFI interface.
+ Requires `clang-17` and `lld-17` with the `gold` plugin (APT packages `llvm-17` and `lld-17`).
+ 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.
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.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ exclude = [

[workspace.package]
version = "2.0.0-beta1"
rust-version = "1.71.1"
rust-version = "1.80"
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 @@ category = "ICU4X Development"
env = { ICU4X_DATA_DIR = "../stubdata" }
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.71.1 --profile minimal
exec --fail-on-error cargo +1.71.1 check --all-targets --all-features
exec --fail-on-error rustup install 1.80 --profile minimal
exec --fail-on-error cargo +1.80 check --all-targets --all-features
'''

[tasks.ci-job-test]
Expand Down Expand Up @@ -170,8 +170,8 @@ category = "CI"
env = { ICU4X_DATA_DIR = "../stubdata" }
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.71.1 --profile minimal
exec --fail-on-error cargo +1.71.1 make check-all-features-chunked 1
exec --fail-on-error rustup install 1.80 --profile minimal
exec --fail-on-error cargo +1.80 make check-all-features-chunked 1
'''

[tasks.ci-job-msrv-features-2]
Expand All @@ -180,8 +180,8 @@ category = "CI"
env = { ICU4X_DATA_DIR = "../stubdata" }
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.71.1 --profile minimal
exec --fail-on-error cargo +1.71.1 make check-all-features-chunked 2
exec --fail-on-error rustup install 1.80 --profile minimal
exec --fail-on-error cargo +1.80 make check-all-features-chunked 2
'''

[tasks.ci-job-msrv-features-3]
Expand All @@ -190,8 +190,8 @@ category = "CI"
env = { ICU4X_DATA_DIR = "../stubdata" }
script_runner = "@duckscript"
script = '''
exec --fail-on-error rustup install 1.71.1 --profile minimal
exec --fail-on-error cargo +1.71.1 make check-all-features-chunked 3
exec --fail-on-error rustup install 1.80 --profile minimal
exec --fail-on-error cargo +1.80 make check-all-features-chunked 3
'''

[tasks.ci-job-msrv-features]
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.71.1"
msrv = "1.80"
14 changes: 7 additions & 7 deletions provider/baked/tests/data/hello_world_v1_marker.rs.data
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#[macro_export]
macro_rules! __impl_hello_world_v1_marker {
($ provider : ty) => {
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
const _: () = <$provider>::MUST_USE_MAKE_PROVIDER_MACRO;
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
impl $provider {
const DATA_HELLO_WORLD_V1_MARKER: icu_provider_baked::zerotrie::Data<icu_provider::hello_world::HelloWorldV1Marker> = icu_provider_baked::zerotrie::Data { trie: icu_provider_baked::zerotrie::ZeroTrieSimpleAscii { store: b"\xCDbcdefijlprsvz\x02\x04\nCIKX[^fpsn\x80s\x81e\x82-AT\x83\xC3lno\x012\x84\x85\xC2\x1E-\treverse\x90\t\xC301G\x0C\x0F\xC201\x06\xC212\x01\x86\x879\x8842\x89B\x8A-u-sd-gbeng\x8B\x8C\xC2ai\x01\x8D\x8Es\x8Fa\x90\0\x1Ereverse\x90\na\x90\x01t\x90\x02\xC2ou\x02\x90\x03\x90\x04r\x90\x05-Latn\x90\x06i\x90\x07h\x90\x08" }, values: &[icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("ওহে বিশ\u{9cd}ব") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Ahoj světe") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Hallo Welt") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Servus Welt") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Καλημέρα κόσμε") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Hello World") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Hello from 🗺\u{fe0f}") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Hello from 🌍") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Hello from 🌎") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Hello from 🌏") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Hello from 🇬🇧") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Hello from 🏴\u{e0067}\u{e0062}\u{e0065}\u{e006e}\u{e0067}\u{e007f}") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Saluton, Mondo") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("سلام دنیا\u{200e}") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("hei maailma") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Halló, heimur") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("こんにちは世界") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Ave, munde") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Olá, mundo") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Salut, lume") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Привет, мир") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Поздрав свете") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Pozdrav svete") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Xin chào thế giới") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("你好世界") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("Olleh Dlrow") }, icu_provider::hello_world::HelloWorldV1 { message: alloc::borrow::Cow::Borrowed("界世はちにんこ") }] };
}
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
impl icu_provider::DataProvider<icu_provider::hello_world::HelloWorldV1Marker> for $provider {
fn load(&self, req: icu_provider::DataRequest) -> Result<icu_provider::DataResponse<icu_provider::hello_world::HelloWorldV1Marker>, icu_provider::DataError> {
let metadata = Default::default();
Expand All @@ -29,7 +29,7 @@ macro_rules! __impl_hello_world_v1_marker {
};
($ provider : ty , ITER) => {
__impl_hello_world_v1_marker!($provider);
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
impl icu_provider::IterableDataProvider<icu_provider::hello_world::HelloWorldV1Marker> for $provider {
fn iter_ids(&self) -> Result<std::collections::BTreeSet<icu_provider::DataIdentifierCow<'static>>, icu_provider::DataError> {
Ok(icu_provider_baked::DataStore::iter(&Self::DATA_HELLO_WORLD_V1_MARKER).collect())
Expand All @@ -38,7 +38,7 @@ macro_rules! __impl_hello_world_v1_marker {
};
($ provider : ty , DRY) => {
__impl_hello_world_v1_marker!($provider);
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
impl icu_provider::DryDataProvider<icu_provider::hello_world::HelloWorldV1Marker> for $provider {
fn dry_load(&self, req: icu_provider::DataRequest) -> Result<icu_provider::DataResponseMetadata, icu_provider::DataError> {
icu_provider::DataProvider::<icu_provider::hello_world::HelloWorldV1Marker>::load(self, req).map(|r| r.metadata)
Expand All @@ -47,13 +47,13 @@ macro_rules! __impl_hello_world_v1_marker {
};
($ provider : ty , DRY , ITER) => {
__impl_hello_world_v1_marker!($provider);
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
impl icu_provider::DryDataProvider<icu_provider::hello_world::HelloWorldV1Marker> for $provider {
fn dry_load(&self, req: icu_provider::DataRequest) -> Result<icu_provider::DataResponseMetadata, icu_provider::DataError> {
icu_provider::DataProvider::<icu_provider::hello_world::HelloWorldV1Marker>::load(self, req).map(|r| r.metadata)
}
}
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
impl icu_provider::IterableDataProvider<icu_provider::hello_world::HelloWorldV1Marker> for $provider {
fn iter_ids(&self) -> Result<std::collections::BTreeSet<icu_provider::DataIdentifierCow<'static>>, icu_provider::DataError> {
Ok(icu_provider_baked::DataStore::iter(&Self::DATA_HELLO_WORLD_V1_MARKER).collect())
Expand Down
4 changes: 2 additions & 2 deletions provider/baked/tests/data/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ include!("hello_world_v1_marker.rs.data");
#[macro_export]
macro_rules! __make_provider {
($ name : ty) => {
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
impl $name {
#[allow(dead_code)]
pub(crate) const MUST_USE_MAKE_PROVIDER_MACRO: () = ();
Expand All @@ -35,7 +35,7 @@ macro_rules! impl_data_provider {
#[allow(unused_macros)]
macro_rules! impl_any_provider {
($ provider : ty) => {
#[clippy::msrv = "1.71.1"]
#[clippy::msrv = "1.80"]
impl icu_provider::any::AnyProvider for $provider {
fn load_any(&self, marker: icu_provider::DataMarkerInfo, req: icu_provider::DataRequest) -> Result<icu_provider::AnyResponse, icu_provider::DataError> {
match marker.path.hashed() {
Expand Down
14 changes: 7 additions & 7 deletions provider/data/calendar/data/chinese_cache_v1_marker.rs.data

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

Loading

0 comments on commit 617eb42

Please sign in to comment.