From babd49ff57295fc299053055f8d165b6f276ea74 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Fri, 28 Jul 2023 19:16:53 +0200 Subject: [PATCH 1/3] Update targets to 1.71.0 --- src/targets.rs | 2 +- src/targets/builtins.rs | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/targets.rs b/src/targets.rs index c25dccd..bd06e01 100644 --- a/src/targets.rs +++ b/src/targets.rs @@ -372,7 +372,7 @@ pub fn get_builtin_target_by_triple(triple: &str) -> Option<&'static TargetInfo> /// versions. /// /// ``` -/// assert_eq!("1.70.0", cfg_expr::targets::rustc_version()); +/// assert_eq!("1.71.0", cfg_expr::targets::rustc_version()); /// ``` pub fn rustc_version() -> &'static str { builtins::RUSTC_VERSION diff --git a/src/targets/builtins.rs b/src/targets/builtins.rs index aca3276..dee2975 100644 --- a/src/targets/builtins.rs +++ b/src/targets/builtins.rs @@ -10,7 +10,7 @@ use super::*; -pub(crate) const RUSTC_VERSION: &str = "1.70.0"; +pub(crate) const RUSTC_VERSION: &str = "1.71.0"; pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { @@ -504,7 +504,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ families: Families::new_const(&[]), pointer_width: 32, endian: Endian::big, - has_atomics: HasAtomics::atomic_8_16_32_ptr, + has_atomics: HasAtomics::atomic_8_16_32_64_ptr, panic: Panic::abort, }, TargetInfo { @@ -517,7 +517,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ families: Families::new_const(&[]), pointer_width: 32, endian: Endian::big, - has_atomics: HasAtomics::atomic_8_16_32_ptr, + has_atomics: HasAtomics::atomic_8_16_32_64_ptr, panic: Panic::abort, }, TargetInfo { @@ -673,7 +673,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ families: Families::unix, pointer_width: 32, endian: Endian::little, - has_atomics: HasAtomics::atomic_8_16_32_ptr, + has_atomics: HasAtomics::atomic_8_16_32_64_ptr, panic: Panic::abort, }, TargetInfo { @@ -881,7 +881,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ families: Families::new_const(&[]), pointer_width: 32, endian: Endian::little, - has_atomics: HasAtomics::atomic_8_16_32_ptr, + has_atomics: HasAtomics::atomic_8_16_32_64_ptr, panic: Panic::abort, }, TargetInfo { @@ -894,7 +894,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ families: Families::new_const(&[]), pointer_width: 32, endian: Endian::little, - has_atomics: HasAtomics::atomic_8_16_32_ptr, + has_atomics: HasAtomics::atomic_8_16_32_64_ptr, panic: Panic::abort, }, TargetInfo { @@ -2665,6 +2665,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ has_atomics: HasAtomics::atomic_8_16_32_64_ptr, panic: Panic::unwind, }, + TargetInfo { + triple: Triple::new_const("x86_64h-apple-darwin"), + os: Some(Os::macos), + abi: None, + arch: Arch::x86_64, + env: None, + vendor: Some(Vendor::apple), + families: Families::unix, + pointer_width: 64, + endian: Endian::little, + has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr, + panic: Panic::unwind, + }, ]; impl super::Abi {} From 235a324c1cd6f6dfc86b05c61c395a85e85c8360 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Fri, 28 Jul 2023 19:20:18 +0200 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 083c145..12b8b6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - ReleaseDate +### Changed +- [PR#62](https://github.com/EmbarkStudios/cfg-expr/pull/62) updated the builtin target list to 1.71.0. + ## [0.15.3] - 2023-06-19 ### Fixed - [PR#61](https://github.com/EmbarkStudios/cfg-expr/pull/61) fixed an issue where `target_os = "none"` was not matching target triplets where `os = None`. Thanks [@sunshowers](https://github.com/sunshowers)! From 68028ae125ef081ba7325c7485ac087eb136fc14 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Fri, 28 Jul 2023 19:25:49 +0200 Subject: [PATCH 3/3] Bump --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78c0af2..1307032 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: publish-check: name: Publish Check - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable