From 09a32f9ee955300b04044832035e548c73a72601 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Thu, 18 Sep 2025 17:50:27 +0200 Subject: [PATCH 1/3] Update to rust 1.90.0 --- README.md | 8 ++++---- src/targets/builtins.rs | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 911ca78..96b589f 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ # `⚙️ cfg-expr` -**A parser and evaluator for Rust `cfg()` expressions. Builtin targets as of [1.89.0] are supported.** +**A parser and evaluator for Rust `cfg()` expressions. Builtin targets as of [1.90.0] are supported.** [![Build Status](https://github.com/EmbarkStudios/cfg-expr/workflows/CI/badge.svg)](https://github.com/EmbarkStudios/cfg-expr/actions?workflow=CI) [![Crates.io](https://img.shields.io/crates/v/cfg-expr.svg)](https://crates.io/crates/cfg-expr) [![Docs](https://docs.rs/cfg-expr/badge.svg)](https://docs.rs/cfg-expr) [![Minimum Stable Rust Version](https://img.shields.io/badge/Rust%20MSRV-1.70.0-blue?color=fc8d62&logo=rust)](https://blog.rust-lang.org/2023/06/01/Rust-1.70.0.html) -[![Rust Targets](https://img.shields.io/badge/Rust%20Targets-1.89.0-blue.svg)](https://forge.rust-lang.org/release/platform-support.html) +[![Rust Targets](https://img.shields.io/badge/Rust%20Targets-1.90.0-blue.svg)](https://forge.rust-lang.org/release/platform-support.html) [![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) [![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](https://embark.dev) @@ -24,7 +24,7 @@ `cfg-expr` is a crate that can be used to parse and evaluate Rust `cfg()` expressions, both as declarable in Rust code itself, as well in cargo manifests' `[target.'cfg()'.dependencies]` sections. -It contains a list of all builtin targets known to rustc as of [1.89.0] that can be used to determine if a particular cfg expression is satisfiable. +It contains a list of all builtin targets known to rustc as of [1.90.0] that can be used to determine if a particular cfg expression is satisfiable. ```rust use cfg_expr::{targets::get_builtin_target_by_triple, Expression, Predicate}; @@ -100,4 +100,4 @@ at your option. Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. -[1.89.0]: (https://forge.rust-lang.org/release/platform-support.html) +[1.90.0]: (https://forge.rust-lang.org/release/platform-support.html) diff --git a/src/targets/builtins.rs b/src/targets/builtins.rs index bc19607..6f37123 100644 --- a/src/targets/builtins.rs +++ b/src/targets/builtins.rs @@ -10,7 +10,7 @@ use super::*; -pub(crate) const RUSTC_VERSION: &str = "1.89.0"; +pub(crate) const RUSTC_VERSION: &str = "1.90.0"; pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { @@ -2122,7 +2122,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { triple: Triple::new_const("powerpc64-unknown-freebsd"), os: Some(Os::freebsd), - abi: None, + abi: Some(Abi::elfv2), arch: Arch::powerpc64, env: None, vendor: Some(Vendor::unknown), @@ -2135,7 +2135,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { triple: Triple::new_const("powerpc64-unknown-linux-gnu"), os: Some(Os::linux), - abi: None, + abi: Some(Abi::elfv1), arch: Arch::powerpc64, env: Some(Env::gnu), vendor: Some(Vendor::unknown), @@ -2148,7 +2148,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { triple: Triple::new_const("powerpc64-unknown-linux-musl"), os: Some(Os::linux), - abi: None, + abi: Some(Abi::elfv2), arch: Arch::powerpc64, env: Some(Env::musl), vendor: Some(Vendor::unknown), @@ -2161,7 +2161,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { triple: Triple::new_const("powerpc64-unknown-openbsd"), os: Some(Os::openbsd), - abi: None, + abi: Some(Abi::elfv2), arch: Arch::powerpc64, env: None, vendor: Some(Vendor::unknown), @@ -2174,7 +2174,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { triple: Triple::new_const("powerpc64-wrs-vxworks"), os: Some(Os::vxworks), - abi: None, + abi: Some(Abi::elfv1), arch: Arch::powerpc64, env: Some(Env::gnu), vendor: Some(Vendor::wrs), @@ -2187,7 +2187,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { triple: Triple::new_const("powerpc64le-unknown-freebsd"), os: Some(Os::freebsd), - abi: None, + abi: Some(Abi::elfv2), arch: Arch::powerpc64, env: None, vendor: Some(Vendor::unknown), @@ -2200,7 +2200,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { triple: Triple::new_const("powerpc64le-unknown-linux-gnu"), os: Some(Os::linux), - abi: None, + abi: Some(Abi::elfv2), arch: Arch::powerpc64, env: Some(Env::gnu), vendor: Some(Vendor::unknown), @@ -2213,7 +2213,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ TargetInfo { triple: Triple::new_const("powerpc64le-unknown-linux-musl"), os: Some(Os::linux), - abi: None, + abi: Some(Abi::elfv2), arch: Arch::powerpc64, env: Some(Env::musl), vendor: Some(Vendor::unknown), @@ -3791,6 +3791,8 @@ impl super::Abi { pub const abiv2hf: Abi = Abi::new_const("abiv2hf"); pub const eabi: Abi = Abi::new_const("eabi"); pub const eabihf: Abi = Abi::new_const("eabihf"); + pub const elfv1: Abi = Abi::new_const("elfv1"); + pub const elfv2: Abi = Abi::new_const("elfv2"); pub const fortanix: Abi = Abi::new_const("fortanix"); pub const ilp32: Abi = Abi::new_const("ilp32"); pub const ilp32e: Abi = Abi::new_const("ilp32e"); From 21bde618e9834c2017752ee1801438703d5c00ad Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Thu, 18 Sep 2025 17:51:12 +0200 Subject: [PATCH 2/3] Remove lint --- .cargo/config.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index dca7598..23b1247 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -39,7 +39,6 @@ rustflags = [ "-Wclippy::map_err_ignore", "-Wclippy::map_flatten", "-Wclippy::map_unwrap_or", - "-Wclippy::match_on_vec_items", "-Wclippy::match_same_arms", "-Wclippy::match_wild_err_arm", "-Wclippy::match_wildcard_for_single_variants", From 5b515ddb02ef0e469897729388cc9efa92a835c4 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Thu, 18 Sep 2025 17:52:26 +0200 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9704bb5..24110ac 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#82](https://github.com/EmbarkStudios/cfg-expr/pull/82) updated the builtin target list to 1.90.0. + ## [0.20.2] - 2025-08-07 ### Changed - [PR#81](https://github.com/EmbarkStudios/cfg-expr/pull/81) updated the builtin target list to 1.89.0.