Skip to content

Commit 864e859

Browse files
committed
Enable rust2024-incompatible pat and keyword-ident lints
1 parent f426348 commit 864e859

20 files changed

Lines changed: 62 additions & 64 deletions

File tree

‎Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,13 @@ wasm-bindgen = "0.2.100"
190190
[workspace.lints.rust]
191191
unsafe_code = "allow"
192192
unsafe_op_in_unsafe_fn = "deny"
193+
194+
# rust_2024_compatibility
193195
missing_unsafe_on_extern = "deny"
194196
unsafe_attr_outside_unsafe = "deny"
195197
deprecated_safe_2024 = "deny"
198+
rust_2024_incompatible_pat = "deny"
199+
keyword_idents_2024 = "deny"
196200

197201
[workspace.lints.clippy]
198202
perf = "warn"

‎common/src/int.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub fn bytes_to_int(lit: &[u8], mut base: u32) -> Option<BigInt> {
5050
base = parsed;
5151
true
5252
} else {
53-
if let [_first, ref others @ .., last] = lit {
53+
if let [_first, others @ .., last] = lit {
5454
let is_zero =
5555
others.iter().all(|&c| c == b'0' || c == b'_') && *last == b'0';
5656
if !is_zero {

‎compiler/codegen/src/compile.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3302,13 +3302,13 @@ impl Compiler {
33023302
elt, generators, ..
33033303
}) => {
33043304
Self::contains_await(elt)
3305-
|| generators.iter().any(|gen| Self::contains_await(&gen.iter))
3305+
|| generators.iter().any(|jen| Self::contains_await(&jen.iter))
33063306
}
33073307
Expr::SetComp(located_ast::ExprSetComp {
33083308
elt, generators, ..
33093309
}) => {
33103310
Self::contains_await(elt)
3311-
|| generators.iter().any(|gen| Self::contains_await(&gen.iter))
3311+
|| generators.iter().any(|jen| Self::contains_await(&jen.iter))
33123312
}
33133313
Expr::DictComp(located_ast::ExprDictComp {
33143314
key,
@@ -3318,13 +3318,13 @@ impl Compiler {
33183318
}) => {
33193319
Self::contains_await(key)
33203320
|| Self::contains_await(value)
3321-
|| generators.iter().any(|gen| Self::contains_await(&gen.iter))
3321+
|| generators.iter().any(|jen| Self::contains_await(&jen.iter))
33223322
}
33233323
Expr::GeneratorExp(located_ast::ExprGeneratorExp {
33243324
elt, generators, ..
33253325
}) => {
33263326
Self::contains_await(elt)
3327-
|| generators.iter().any(|gen| Self::contains_await(&gen.iter))
3327+
|| generators.iter().any(|jen| Self::contains_await(&jen.iter))
33283328
}
33293329
Expr::Starred(expr) => Self::contains_await(&expr.value),
33303330
Expr::IfExp(located_ast::ExprIfExp {

‎derive-impl/src/pytraverse.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn gen_trace_code(item: &mut DeriveInput) -> Result<TokenStream> {
7070
syn::Data::Struct(s) => {
7171
let fields = &mut s.fields;
7272
match fields {
73-
syn::Fields::Named(ref mut fields) => {
73+
syn::Fields::Named(fields) => {
7474
let res: Vec<TokenStream> = fields
7575
.named
7676
.iter_mut()

‎derive-impl/src/util.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ impl AttributeExt for Attribute {
529529
fn try_remove_name(&mut self, item_name: &str) -> Result<Option<NestedMeta>> {
530530
self.try_meta_mut(|meta| {
531531
let nested = match meta {
532-
Meta::List(MetaList { ref mut nested, .. }) => Ok(nested),
532+
Meta::List(MetaList { nested, .. }) => Ok(nested),
533533
other => Err(syn::Error::new(
534534
other.span(),
535535
format!(

‎jit/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ pub enum AbiValue {
215215
impl AbiValue {
216216
fn to_libffi_arg(&self) -> libffi::middle::Arg {
217217
match self {
218-
AbiValue::Int(ref i) => libffi::middle::Arg::new(i),
219-
AbiValue::Float(ref f) => libffi::middle::Arg::new(f),
220-
AbiValue::Bool(ref b) => libffi::middle::Arg::new(b),
218+
AbiValue::Int(i) => libffi::middle::Arg::new(i),
219+
AbiValue::Float(f) => libffi::middle::Arg::new(f),
220+
AbiValue::Bool(b) => libffi::middle::Arg::new(b),
221221
}
222222
}
223223
}

‎stdlib/src/csv.rs‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,12 @@ mod _csv {
272272
let Some(name) = name.payload_if_subclass::<PyStr>(vm) else {
273273
return Err(vm.new_type_error("argument 0 must be a string".to_string()));
274274
};
275-
let mut dialect = match dialect {
275+
let dialect = match dialect {
276276
OptionalArg::Present(d) => PyDialect::try_from_object(vm, d)
277277
.map_err(|_| vm.new_type_error("argument 1 must be a dialect object".to_owned()))?,
278278
OptionalArg::Missing => opts.result(vm)?,
279279
};
280-
opts.update_pydialect(&mut dialect);
280+
let dialect = opts.update_pydialect(dialect);
281281
GLOBAL_HASHMAP
282282
.lock()
283283
.insert(name.as_str().to_owned(), dialect);
@@ -665,7 +665,7 @@ mod _csv {
665665
}
666666

667667
impl FormatOptions {
668-
fn update_pydialect<'b>(&self, res: &'b mut PyDialect) -> &'b mut PyDialect {
668+
fn update_pydialect(&self, mut res: PyDialect) -> PyDialect {
669669
macro_rules! check_and_fill {
670670
($res:ident, $e:ident) => {{
671671
if let Some(t) = self.$e {
@@ -699,24 +699,18 @@ mod _csv {
699699
DialectItem::Str(name) => {
700700
let g = GLOBAL_HASHMAP.lock();
701701
if let Some(dialect) = g.get(name) {
702-
let mut dialect = *dialect;
703-
self.update_pydialect(&mut dialect);
704-
Ok(dialect)
702+
Ok(self.update_pydialect(*dialect))
705703
} else {
706704
Err(new_csv_error(vm, format!("{} is not registed.", name)))
707705
}
708706
// TODO
709707
// Maybe need to update the obj from HashMap
710708
}
711-
DialectItem::Obj(mut o) => {
712-
self.update_pydialect(&mut o);
713-
Ok(o)
714-
}
709+
DialectItem::Obj(o) => Ok(self.update_pydialect(*o)),
715710
DialectItem::None => {
716711
let g = GLOBAL_HASHMAP.lock();
717-
let mut res = *g.get("excel").unwrap();
718-
self.update_pydialect(&mut res);
719-
Ok(res)
712+
let res = *g.get("excel").unwrap();
713+
Ok(self.update_pydialect(res))
720714
}
721715
}
722716
}

‎stdlib/src/json/machinery.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pub fn scanstring<'a>(
135135
};
136136
let unterminated_err = || DecodeError::new("Unterminated string starting at", end - 1);
137137
let mut chars = s.char_indices().enumerate().skip(end).peekable();
138-
let (_, (mut chunk_start, _)) = chars.peek().ok_or_else(unterminated_err)?;
138+
let &(_, (mut chunk_start, _)) = chars.peek().ok_or_else(unterminated_err)?;
139139
while let Some((char_i, (byte_i, c))) = chars.next() {
140140
match c {
141141
'"' => {

‎stdlib/src/mmap.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ mod mmap {
497497
fn as_bytes(&self) -> BorrowedValue<[u8]> {
498498
PyMutexGuard::map_immutable(self.mmap.lock(), |m| {
499499
match m.as_ref().expect("mmap closed or invalid") {
500-
MmapObj::Read(ref mmap) => &mmap[..],
501-
MmapObj::Write(ref mmap) => &mmap[..],
500+
MmapObj::Read(mmap) => &mmap[..],
501+
MmapObj::Write(mmap) => &mmap[..],
502502
}
503503
})
504504
.into()

‎stdlib/src/socket.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,7 @@ mod _socket {
19241924
let host = opts.host.as_ref().map(|s| s.as_str());
19251925
let port = opts.port.as_ref().map(|p| -> std::borrow::Cow<str> {
19261926
match p {
1927-
Either::A(ref s) => s.as_str().into(),
1927+
Either::A(s) => s.as_str().into(),
19281928
Either::B(i) => i.to_string().into(),
19291929
}
19301930
});

0 commit comments

Comments
 (0)