Skip to content

Commit 8212431

Browse files
Jake-ShadleJake-Shadle
authored
Update to 1.67.0 (#57)
* Update to 1.67.0 * Fix lints
1 parent c1e7ab7 commit 8212431

File tree

4 files changed

+70
-23
lines changed

4 files changed

+70
-23
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
<!-- next-header -->
1111
## [Unreleased] - ReleaseDate
12+
### Changed
13+
- [PR#57](https://github.com/EmbarkStudios/cfg-expr/pull/57) updated the builtin target list to 1.67.0.
14+
1215
## [0.13.0] - 2022-12-19
1316
### Changed
1417
- [PR#56](https://github.com/EmbarkStudios/cfg-expr/pull/56) updated the builtin target list to 1.66.0. Thanks [@sunshowers](https://github.com/sunshowers)!

‎src/targets.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ impl std::str::FromStr for HasAtomic {
122122
impl std::fmt::Display for HasAtomic {
123123
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
124124
match self {
125-
Self::IntegerSize(size) => write!(f, "{}", size),
125+
Self::IntegerSize(size) => write!(f, "{size}"),
126126
Self::Pointer => write!(f, "ptr"),
127127
}
128128
}
@@ -183,7 +183,7 @@ impl std::fmt::Display for Families {
183183
write!(f, "{{")?;
184184
let len = self.0.len();
185185
for (idx, family) in self.0.iter().enumerate() {
186-
write!(f, "{}", family)?;
186+
write!(f, "{family}")?;
187187
if idx + 1 < len {
188188
write!(f, ", ")?;
189189
}
@@ -243,7 +243,7 @@ impl std::fmt::Display for HasAtomics {
243243
write!(f, "{{")?;
244244
let len = self.0.len();
245245
for (idx, has_atomic) in self.0.iter().enumerate() {
246-
write!(f, "{}", has_atomic)?;
246+
write!(f, "{has_atomic}")?;
247247
if idx + 1 < len {
248248
write!(f, ", ")?;
249249
}
@@ -372,7 +372,7 @@ pub fn get_builtin_target_by_triple(triple: &str) -> Option<&'static TargetInfo>
372372
/// versions.
373373
///
374374
/// ```
375-
/// assert_eq!("1.66.0", cfg_expr::targets::rustc_version());
375+
/// assert_eq!("1.67.0", cfg_expr::targets::rustc_version());
376376
/// ```
377377
pub fn rustc_version() -> &'static str {
378378
builtins::RUSTC_VERSION

‎src/targets/builtins.rs‎

Lines changed: 58 additions & 14 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.66.0";
13+
pub(crate) const RUSTC_VERSION: &str = "1.67.0";
1414

1515
pub const ALL_BUILTINS: &[TargetInfo] = &[
1616
TargetInfo {
@@ -273,6 +273,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
273273
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
274274
panic: Panic::abort,
275275
},
276+
TargetInfo {
277+
triple: Triple::new_const("aarch64-unknown-nto-qnx710"),
278+
os: Some(Os::nto),
279+
abi: None,
280+
arch: Arch::aarch64,
281+
env: Some(Env::nto71),
282+
vendor: Some(Vendor::unknown),
283+
families: Families::unix,
284+
pointer_width: 64,
285+
endian: Endian::little,
286+
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
287+
panic: Panic::unwind,
288+
},
276289
TargetInfo {
277290
triple: Triple::new_const("aarch64-unknown-openbsd"),
278291
os: Some(Os::openbsd),
@@ -1274,6 +1287,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
12741287
has_atomics: HasAtomics::atomic_8_16_32_ptr,
12751288
panic: Panic::unwind,
12761289
},
1290+
TargetInfo {
1291+
triple: Triple::new_const("mipsel-sony-psx"),
1292+
os: None,
1293+
abi: None,
1294+
arch: Arch::mips,
1295+
env: Some(Env::psx),
1296+
vendor: Some(Vendor::sony),
1297+
families: Families::new_const(&[]),
1298+
pointer_width: 32,
1299+
endian: Endian::little,
1300+
has_atomics: HasAtomics::new_const(&[]),
1301+
panic: Panic::abort,
1302+
},
12771303
TargetInfo {
12781304
triple: Triple::new_const("mipsel-unknown-linux-gnu"),
12791305
os: Some(Os::linux),
@@ -1508,6 +1534,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
15081534
has_atomics: HasAtomics::atomic_8_16_32_ptr,
15091535
panic: Panic::unwind,
15101536
},
1537+
TargetInfo {
1538+
triple: Triple::new_const("powerpc64-ibm-aix"),
1539+
os: Some(Os::aix),
1540+
abi: None,
1541+
arch: Arch::powerpc64,
1542+
env: None,
1543+
vendor: Some(Vendor::ibm),
1544+
families: Families::unix,
1545+
pointer_width: 64,
1546+
endian: Endian::big,
1547+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
1548+
panic: Panic::unwind,
1549+
},
15111550
TargetInfo {
15121551
triple: Triple::new_const("powerpc64-unknown-freebsd"),
15131552
os: Some(Os::freebsd),
@@ -2223,6 +2262,19 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
22232262
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
22242263
panic: Panic::unwind,
22252264
},
2265+
TargetInfo {
2266+
triple: Triple::new_const("x86_64-pc-nto-qnx710"),
2267+
os: Some(Os::nto),
2268+
abi: None,
2269+
arch: Arch::x86_64,
2270+
env: Some(Env::nto71),
2271+
vendor: Some(Vendor::unknown),
2272+
families: Families::unix,
2273+
pointer_width: 64,
2274+
endian: Endian::little,
2275+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
2276+
panic: Panic::unwind,
2277+
},
22262278
TargetInfo {
22272279
triple: Triple::new_const("x86_64-pc-solaris"),
22282280
os: Some(Os::solaris),
@@ -2431,19 +2483,6 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
24312483
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
24322484
panic: Panic::abort,
24332485
},
2434-
TargetInfo {
2435-
triple: Triple::new_const("x86_64-unknown-none-linuxkernel"),
2436-
os: None,
2437-
abi: None,
2438-
arch: Arch::x86_64,
2439-
env: Some(Env::gnu),
2440-
vendor: Some(Vendor::unknown),
2441-
families: Families::new_const(&[]),
2442-
pointer_width: 64,
2443-
endian: Endian::little,
2444-
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
2445-
panic: Panic::abort,
2446-
},
24472486
TargetInfo {
24482487
triple: Triple::new_const("x86_64-unknown-openbsd"),
24492488
os: Some(Os::openbsd),
@@ -2554,6 +2593,7 @@ impl super::Vendor {
25542593
pub const apple: Vendor = Vendor::new_const("apple");
25552594
pub const espressif: Vendor = Vendor::new_const("espressif");
25562595
pub const fortanix: Vendor = Vendor::new_const("fortanix");
2596+
pub const ibm: Vendor = Vendor::new_const("ibm");
25572597
pub const kmc: Vendor = Vendor::new_const("kmc");
25582598
pub const nintendo: Vendor = Vendor::new_const("nintendo");
25592599
pub const nvidia: Vendor = Vendor::new_const("nvidia");
@@ -2566,6 +2606,7 @@ impl super::Vendor {
25662606
}
25672607

25682608
impl super::Os {
2609+
pub const aix: Os = Os::new_const("aix");
25692610
pub const android: Os = Os::new_const("android");
25702611
pub const cuda: Os = Os::new_const("cuda");
25712612
pub const dragonfly: Os = Os::new_const("dragonfly");
@@ -2582,6 +2623,7 @@ impl super::Os {
25822623
pub const linux: Os = Os::new_const("linux");
25832624
pub const macos: Os = Os::new_const("macos");
25842625
pub const netbsd: Os = Os::new_const("netbsd");
2626+
pub const nto: Os = Os::new_const("nto");
25852627
pub const openbsd: Os = Os::new_const("openbsd");
25862628
pub const psp: Os = Os::new_const("psp");
25872629
pub const redox: Os = Os::new_const("redox");
@@ -2622,6 +2664,8 @@ impl super::Env {
26222664
pub const msvc: Env = Env::new_const("msvc");
26232665
pub const musl: Env = Env::new_const("musl");
26242666
pub const newlib: Env = Env::new_const("newlib");
2667+
pub const nto71: Env = Env::new_const("nto71");
2668+
pub const psx: Env = Env::new_const("psx");
26252669
pub const relibc: Env = Env::new_const("relibc");
26262670
pub const sgx: Env = Env::new_const("sgx");
26272671
pub const uclibc: Env = Env::new_const("uclibc");

‎tests/eval.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl Target {
3535
// There are enough new weird architectures added in each version of
3636
// Rust that it is difficult to keep target-lexicon aware of all of
3737
// them. So try parsing this triple, but don't fail if it doesn't work.
38-
eprintln!("failed to parse '{}': {:?}", triple, e);
38+
eprintln!("failed to parse '{triple}': {e:?}");
3939
None
4040
}
4141
},
@@ -59,8 +59,8 @@ macro_rules! tg_match {
5959
let linfo = tg.matches(l);
6060
assert_eq!(
6161
tinfo, linfo,
62-
"{:#?} builtin didn't match lexicon {:#?} for predicate {:#?}",
63-
$target.builtin, $target.lexicon, tg,
62+
"{:#?} builtin didn't match lexicon {:#?} for predicate {tg:#?}",
63+
$target.builtin, $target.lexicon,
6464
);
6565

6666
return linfo;
@@ -86,8 +86,8 @@ macro_rules! tg_match {
8686
let linfo = tg.matches(l);
8787
assert_eq!(
8888
tinfo, linfo,
89-
"{:#?} builtin didn't match lexicon {:#?} for predicate {:#?}",
90-
$target.builtin, $target.lexicon, tg,
89+
"{:#?} builtin didn't match lexicon {:#?} for predicate {tg:#?}",
90+
$target.builtin, $target.lexicon,
9191
);
9292

9393
return linfo;

0 commit comments

Comments
 (0)