Skip to content

Commit bd05442

Browse files
Jake-ShadleJake-Shadle
committed
Update builtins
1 parent 021f0d4 commit bd05442

File tree

4 files changed

+132
-21
lines changed

4 files changed

+132
-21
lines changed

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ default = []
2323
targets = ["target-lexicon"]
2424

2525
[dependencies]
26-
smallvec = "1.14"
27-
target-lexicon = { version = "=0.13.2", optional = true }
26+
smallvec = "1.15"
27+
target-lexicon = { version = "=0.13.3", optional = true }
2828

2929
[dev-dependencies]
3030
similar-asserts = "1.7"

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
# `⚙️ cfg-expr`
66

7-
**A parser and evaluator for Rust `cfg()` expressions. Builtin targets as of [1.90.0] are supported.**
7+
**A parser and evaluator for Rust `cfg()` expressions. Builtin targets as of [1.91.0] are supported.**
88

99
[![Build Status](https://github.com/EmbarkStudios/cfg-expr/workflows/CI/badge.svg)](https://github.com/EmbarkStudios/cfg-expr/actions?workflow=CI)
1010
[![Crates.io](https://img.shields.io/crates/v/cfg-expr.svg)](https://crates.io/crates/cfg-expr)
1111
[![Docs](https://docs.rs/cfg-expr/badge.svg)](https://docs.rs/cfg-expr)
1212
[![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)
13-
[![Rust Targets](https://img.shields.io/badge/Rust%20Targets-1.90.0-blue.svg)](https://forge.rust-lang.org/release/platform-support.html)
13+
[![Rust Targets](https://img.shields.io/badge/Rust%20Targets-1.91.0-blue.svg)](https://forge.rust-lang.org/release/platform-support.html)
1414
[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
1515
[![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](https://embark.dev)
1616
</div>
@@ -24,7 +24,7 @@
2424

2525
`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.
2626

27-
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.
27+
It contains a list of all builtin targets known to rustc as of [1.91.0] that can be used to determine if a particular cfg expression is satisfiable.
2828

2929
```rust
3030
use cfg_expr::{targets::get_builtin_target_by_triple, Expression, Predicate};
@@ -100,4 +100,4 @@ at your option.
100100

101101
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.
102102

103-
[1.90.0]: (https://forge.rust-lang.org/release/platform-support.html)
103+
[1.91.0]: (https://forge.rust-lang.org/release/platform-support.html)

‎src/targets/builtins.rs‎

Lines changed: 122 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use super::*;
1212

13-
pub(crate) const RUSTC_VERSION: &str = "1.90.0";
13+
pub(crate) const RUSTC_VERSION: &str = "1.91.0";
1414

1515
pub const ALL_BUILTINS: &[TargetInfo] = &[
1616
TargetInfo {
@@ -44,7 +44,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
4444
os: Some(Os::ios),
4545
abi: Some(Abi::macabi),
4646
arch: Arch::aarch64,
47-
env: None,
47+
env: Some(Env::macabi),
4848
vendor: Some(Vendor::apple),
4949
families: Families::unix,
5050
pointer_width: 64,
@@ -57,7 +57,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
5757
os: Some(Os::ios),
5858
abi: Some(Abi::sim),
5959
arch: Arch::aarch64,
60-
env: None,
60+
env: Some(Env::sim),
6161
vendor: Some(Vendor::apple),
6262
families: Families::unix,
6363
pointer_width: 64,
@@ -83,7 +83,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
8383
os: Some(Os::tvos),
8484
abi: Some(Abi::sim),
8585
arch: Arch::aarch64,
86-
env: None,
86+
env: Some(Env::sim),
8787
vendor: Some(Vendor::apple),
8888
families: Families::unix,
8989
pointer_width: 64,
@@ -109,7 +109,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
109109
os: Some(Os::visionos),
110110
abi: Some(Abi::sim),
111111
arch: Arch::aarch64,
112-
env: None,
112+
env: Some(Env::sim),
113113
vendor: Some(Vendor::apple),
114114
families: Families::unix,
115115
pointer_width: 64,
@@ -135,7 +135,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
135135
os: Some(Os::watchos),
136136
abi: Some(Abi::sim),
137137
arch: Arch::aarch64,
138-
env: None,
138+
env: Some(Env::sim),
139139
vendor: Some(Vendor::apple),
140140
families: Families::unix,
141141
pointer_width: 64,
@@ -312,6 +312,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
312312
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
313313
panic: Panic::unwind,
314314
},
315+
TargetInfo {
316+
triple: Triple::new_const("aarch64-unknown-managarm-mlibc"),
317+
os: Some(Os::managarm),
318+
abi: None,
319+
arch: Arch::aarch64,
320+
env: Some(Env::mlibc),
321+
vendor: Some(Vendor::unknown),
322+
families: Families::unix,
323+
pointer_width: 64,
324+
endian: Endian::little,
325+
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
326+
panic: Panic::unwind,
327+
},
315328
TargetInfo {
316329
triple: Triple::new_const("aarch64-unknown-netbsd"),
317330
os: Some(Os::netbsd),
@@ -507,6 +520,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
507520
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
508521
panic: Panic::unwind,
509522
},
523+
TargetInfo {
524+
triple: Triple::new_const("aarch64_be-unknown-hermit"),
525+
os: Some(Os::hermit),
526+
abi: None,
527+
arch: Arch::aarch64,
528+
env: None,
529+
vendor: Some(Vendor::unknown),
530+
families: Families::new_const(&[]),
531+
pointer_width: 64,
532+
endian: Endian::big,
533+
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
534+
panic: Panic::abort,
535+
},
510536
TargetInfo {
511537
triple: Triple::new_const("aarch64_be-unknown-linux-gnu"),
512538
os: Some(Os::linux),
@@ -533,6 +559,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
533559
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
534560
panic: Panic::unwind,
535561
},
562+
TargetInfo {
563+
triple: Triple::new_const("aarch64_be-unknown-linux-musl"),
564+
os: Some(Os::linux),
565+
abi: None,
566+
arch: Arch::aarch64,
567+
env: Some(Env::musl),
568+
vendor: Some(Vendor::unknown),
569+
families: Families::unix,
570+
pointer_width: 64,
571+
endian: Endian::big,
572+
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
573+
panic: Panic::unwind,
574+
},
536575
TargetInfo {
537576
triple: Triple::new_const("aarch64_be-unknown-netbsd"),
538577
os: Some(Os::netbsd),
@@ -546,6 +585,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
546585
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
547586
panic: Panic::unwind,
548587
},
588+
TargetInfo {
589+
triple: Triple::new_const("aarch64_be-unknown-none-softfloat"),
590+
os: None,
591+
abi: Some(Abi::softfloat),
592+
arch: Arch::aarch64,
593+
env: None,
594+
vendor: Some(Vendor::unknown),
595+
families: Families::new_const(&[]),
596+
pointer_width: 64,
597+
endian: Endian::big,
598+
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
599+
panic: Panic::abort,
600+
},
549601
TargetInfo {
550602
triple: Triple::new_const("amdgcn-amd-amdhsa"),
551603
os: Some(Os::amdhsa),
@@ -1105,6 +1157,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
11051157
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
11061158
panic: Panic::abort,
11071159
},
1160+
TargetInfo {
1161+
triple: Triple::new_const("armv7a-vex-v5"),
1162+
os: Some(Os::vexos),
1163+
abi: Some(Abi::eabihf),
1164+
arch: Arch::arm,
1165+
env: Some(Env::v5),
1166+
vendor: Some(Vendor::vex),
1167+
families: Families::new_const(&[]),
1168+
pointer_width: 32,
1169+
endian: Endian::little,
1170+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
1171+
panic: Panic::abort,
1172+
},
11081173
TargetInfo {
11091174
triple: Triple::new_const("armv7k-apple-watchos"),
11101175
os: Some(Os::watchos),
@@ -1266,7 +1331,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
12661331
os: Some(Os::ios),
12671332
abi: Some(Abi::sim),
12681333
arch: Arch::x86,
1269-
env: None,
1334+
env: Some(Env::sim),
12701335
vendor: Some(Vendor::apple),
12711336
families: Families::unix,
12721337
pointer_width: 32,
@@ -2509,6 +2574,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
25092574
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
25102575
panic: Panic::unwind,
25112576
},
2577+
TargetInfo {
2578+
triple: Triple::new_const("riscv64a23-unknown-linux-gnu"),
2579+
os: Some(Os::linux),
2580+
abi: None,
2581+
arch: Arch::riscv64,
2582+
env: Some(Env::gnu),
2583+
vendor: Some(Vendor::unknown),
2584+
families: Families::unix,
2585+
pointer_width: 64,
2586+
endian: Endian::little,
2587+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
2588+
panic: Panic::unwind,
2589+
},
25122590
TargetInfo {
25132591
triple: Triple::new_const("riscv64gc-unknown-freebsd"),
25142592
os: Some(Os::freebsd),
@@ -2574,6 +2652,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
25742652
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
25752653
panic: Panic::unwind,
25762654
},
2655+
TargetInfo {
2656+
triple: Triple::new_const("riscv64gc-unknown-managarm-mlibc"),
2657+
os: Some(Os::managarm),
2658+
abi: None,
2659+
arch: Arch::riscv64,
2660+
env: Some(Env::mlibc),
2661+
vendor: Some(Vendor::unknown),
2662+
families: Families::unix,
2663+
pointer_width: 64,
2664+
endian: Endian::little,
2665+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
2666+
panic: Panic::unwind,
2667+
},
25772668
TargetInfo {
25782669
triple: Triple::new_const("riscv64gc-unknown-netbsd"),
25792670
os: Some(Os::netbsd),
@@ -3177,7 +3268,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
31773268
os: Some(Os::ios),
31783269
abi: Some(Abi::sim),
31793270
arch: Arch::x86_64,
3180-
env: None,
3271+
env: Some(Env::sim),
31813272
vendor: Some(Vendor::apple),
31823273
families: Families::unix,
31833274
pointer_width: 64,
@@ -3190,7 +3281,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
31903281
os: Some(Os::ios),
31913282
abi: Some(Abi::macabi),
31923283
arch: Arch::x86_64,
3193-
env: None,
3284+
env: Some(Env::macabi),
31943285
vendor: Some(Vendor::apple),
31953286
families: Families::unix,
31963287
pointer_width: 64,
@@ -3203,7 +3294,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
32033294
os: Some(Os::tvos),
32043295
abi: Some(Abi::sim),
32053296
arch: Arch::x86_64,
3206-
env: None,
3297+
env: Some(Env::sim),
32073298
vendor: Some(Vendor::apple),
32083299
families: Families::unix,
32093300
pointer_width: 64,
@@ -3216,7 +3307,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
32163307
os: Some(Os::watchos),
32173308
abi: Some(Abi::sim),
32183309
arch: Arch::x86_64,
3219-
env: None,
3310+
env: Some(Env::sim),
32203311
vendor: Some(Vendor::apple),
32213312
families: Families::unix,
32223313
pointer_width: 64,
@@ -3549,6 +3640,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
35493640
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
35503641
panic: Panic::unwind,
35513642
},
3643+
TargetInfo {
3644+
triple: Triple::new_const("x86_64-unknown-managarm-mlibc"),
3645+
os: Some(Os::managarm),
3646+
abi: None,
3647+
arch: Arch::x86_64,
3648+
env: Some(Env::mlibc),
3649+
vendor: Some(Vendor::unknown),
3650+
families: Families::unix,
3651+
pointer_width: 64,
3652+
endian: Endian::little,
3653+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
3654+
panic: Panic::unwind,
3655+
},
35523656
TargetInfo {
35533657
triple: Triple::new_const("x86_64-unknown-netbsd"),
35543658
os: Some(Os::netbsd),
@@ -3856,6 +3960,7 @@ impl super::Vendor {
38563960
pub const unikraft: Vendor = Vendor::new_const("unikraft");
38573961
pub const unknown: Vendor = Vendor::new_const("unknown");
38583962
pub const uwp: Vendor = Vendor::new_const("uwp");
3963+
pub const vex: Vendor = Vendor::new_const("vex");
38593964
pub const win7: Vendor = Vendor::new_const("win7");
38603965
pub const wrs: Vendor = Vendor::new_const("wrs");
38613966
}
@@ -3881,6 +3986,7 @@ impl super::Os {
38813986
pub const linux: Os = Os::new_const("linux");
38823987
pub const lynxos178: Os = Os::new_const("lynxos178");
38833988
pub const macos: Os = Os::new_const("macos");
3989+
pub const managarm: Os = Os::new_const("managarm");
38843990
pub const netbsd: Os = Os::new_const("netbsd");
38853991
pub const nto: Os = Os::new_const("nto");
38863992
pub const nuttx: Os = Os::new_const("nuttx");
@@ -3896,6 +4002,7 @@ impl super::Os {
38964002
pub const tvos: Os = Os::new_const("tvos");
38974003
pub const uefi: Os = Os::new_const("uefi");
38984004
pub const unknown: Os = Os::new_const("unknown");
4005+
pub const vexos: Os = Os::new_const("vexos");
38994006
pub const visionos: Os = Os::new_const("visionos");
39004007
pub const vita: Os = Os::new_const("vita");
39014008
pub const vxworks: Os = Os::new_const("vxworks");
@@ -3926,6 +4033,8 @@ impl super::Families {
39264033

39274034
impl super::Env {
39284035
pub const gnu: Env = Env::new_const("gnu");
4036+
pub const macabi: Env = Env::new_const("macabi");
4037+
pub const mlibc: Env = Env::new_const("mlibc");
39294038
pub const msvc: Env = Env::new_const("msvc");
39304039
pub const musl: Env = Env::new_const("musl");
39314040
pub const newlib: Env = Env::new_const("newlib");
@@ -3938,7 +4047,9 @@ impl super::Env {
39384047
pub const p2: Env = Env::new_const("p2");
39394048
pub const relibc: Env = Env::new_const("relibc");
39404049
pub const sgx: Env = Env::new_const("sgx");
4050+
pub const sim: Env = Env::new_const("sim");
39414051
pub const uclibc: Env = Env::new_const("uclibc");
4052+
pub const v5: Env = Env::new_const("v5");
39424053
}
39434054

39444055
const __has_atomics_8_16_32_64_128_ptr: &[HasAtomic] = &[

0 commit comments

Comments
 (0)