Use Rust 1.76 (#9897)

This commit is contained in:
Micha Reiser 2024-02-08 19:20:08 +01:00 committed by GitHub
parent eb2784c495
commit 688177ff6a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 24 additions and 25 deletions

1
Cargo.lock generated
View file

@ -2277,7 +2277,6 @@ dependencies = [
"rustc-hash",
"serde",
"smallvec",
"static_assertions",
]
[[package]]

View file

@ -21,8 +21,7 @@ impl<'a> LineSuffixes<'a> {
/// Takes all the pending line suffixes.
pub(super) fn take_pending<'l>(
&'l mut self,
) -> impl Iterator<Item = LineSuffixEntry<'a>> + DoubleEndedIterator + 'l + ExactSizeIterator
{
) -> impl DoubleEndedIterator<Item = LineSuffixEntry<'a>> + 'l + ExactSizeIterator {
self.suffixes.drain(..)
}

View file

@ -25,7 +25,6 @@ once_cell = { workspace = true }
rustc-hash = { workspace = true }
serde = { workspace = true, optional = true }
smallvec = { workspace = true }
static_assertions = { workspace = true }
[dev-dependencies]
insta = { workspace = true }

View file

@ -3880,18 +3880,22 @@ impl Ranged for crate::nodes::ParameterWithDefault {
}
}
#[cfg(target_pointer_width = "64")]
mod size_assertions {
use static_assertions::assert_eq_size;
#[cfg(test)]
mod tests {
#[allow(clippy::wildcard_imports)]
use super::*;
assert_eq_size!(Stmt, [u8; 144]);
assert_eq_size!(StmtFunctionDef, [u8; 144]);
assert_eq_size!(StmtClassDef, [u8; 104]);
assert_eq_size!(StmtTry, [u8; 112]);
assert_eq_size!(Expr, [u8; 80]);
assert_eq_size!(Pattern, [u8; 96]);
assert_eq_size!(Mod, [u8; 32]);
#[test]
#[cfg(target_pointer_width = "64")]
fn size() {
assert!(std::mem::size_of::<Stmt>() <= 144);
assert!(std::mem::size_of::<StmtFunctionDef>() <= 144);
assert!(std::mem::size_of::<StmtClassDef>() <= 104);
assert!(std::mem::size_of::<StmtTry>() <= 112);
// 80 for Rustc < 1.76
assert!(matches!(std::mem::size_of::<Expr>(), 72 | 80));
// 96 for Rustc < 1.76
assert!(matches!(std::mem::size_of::<Pattern>(), 88 | 96));
assert!(std::mem::size_of::<Mod>() <= 32);
}
}

View file

@ -560,21 +560,19 @@ impl From<ExprSlice> for ParenthesizedExpr {
}
}
#[cfg(target_pointer_width = "64")]
mod size_assertions {
use static_assertions::assert_eq_size;
use crate::parser::ParenthesizedExpr;
assert_eq_size!(ParenthesizedExpr, [u8; 88]);
}
#[cfg(test)]
mod tests {
use insta::assert_debug_snapshot;
use super::*;
#[cfg(target_pointer_width = "64")]
#[test]
fn size_assertions() {
// 80 with Rustc >= 1.76, 88 with Rustc < 1.76
assert!(matches!(std::mem::size_of::<ParenthesizedExpr>(), 80 | 88));
}
#[test]
fn test_parse_empty() {
let parse_ast = parse_suite("").unwrap();

View file

@ -1,2 +1,2 @@
[toolchain]
channel = "1.75"
channel = "1.76"