Skip to content

Commit 0d06001

Browse files
committed
Auto merge of #10621 - fee1-dead-contrib:bump_syn, r=flip1995
bump syn to 2.0 changelog: none
2 parents 2a774bb + d406f65 commit 0d06001

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if_chain = "1.0"
4949
itertools = "0.10.1"
5050
quote = "1.0"
5151
serde = { version = "1.0.125", features = ["derive"] }
52-
syn = { version = "1.0", features = ["full"] }
52+
syn = { version = "2.0", features = ["full"] }
5353
futures = "0.3"
5454
parking_lot = "0.12"
5555
tokio = { version = "1", features = ["io-util"] }

declare_clippy_lint/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ proc-macro = true
1010
[dependencies]
1111
itertools = "0.10.1"
1212
quote = "1.0.21"
13-
syn = "1.0.100"
13+
syn = "2.0"
1414

1515
[features]
1616
deny-warnings = []

declare_clippy_lint/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
use proc_macro::TokenStream;
77
use quote::{format_ident, quote};
88
use syn::parse::{Parse, ParseStream};
9-
use syn::{parse_macro_input, Attribute, Error, Ident, Lit, LitStr, Meta, Result, Token};
9+
use syn::{parse_macro_input, Attribute, Error, Expr, ExprLit, Ident, Lit, LitStr, Meta, Result, Token};
1010

1111
fn parse_attr<const LEN: usize>(path: [&'static str; LEN], attr: &Attribute) -> Option<LitStr> {
12-
if let Meta::NameValue(name_value) = attr.parse_meta().ok()? {
12+
if let Meta::NameValue(name_value) = &attr.meta {
1313
let path_idents = name_value.path.segments.iter().map(|segment| &segment.ident);
1414

1515
if itertools::equal(path_idents, path)
16-
&& let Lit::Str(lit) = name_value.lit
16+
&& let Expr::Lit(ExprLit { lit: Lit::Str(s), .. }) = &name_value.value
1717
{
18-
return Some(lit);
18+
return Some(s.clone());
1919
}
2020
}
2121

tests/ui/auxiliary/proc_macro_attr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub fn dummy(_args: TokenStream, input: TokenStream) -> TokenStream {
2828
pub fn fake_async_trait(_args: TokenStream, input: TokenStream) -> TokenStream {
2929
let mut item = parse_macro_input!(input as ItemTrait);
3030
for inner in &mut item.items {
31-
if let TraitItem::Method(method) = inner {
31+
if let TraitItem::Fn(method) = inner {
3232
let sig = &method.sig;
3333
let block = &mut method.default;
3434
if let Some(block) = block {
@@ -70,7 +70,7 @@ pub fn rename_my_lifetimes(_args: TokenStream, input: TokenStream) -> TokenStrea
7070

7171
// Look for methods having arbitrary self type taken by &mut ref
7272
for inner in &mut item.items {
73-
if let ImplItem::Method(method) = inner {
73+
if let ImplItem::Fn(method) = inner {
7474
if let Some(FnArg::Typed(pat_type)) = mut_receiver_of(&mut method.sig) {
7575
if let box Type::Reference(reference) = &mut pat_type.ty {
7676
// Target only unnamed lifetimes

tests/ui/needless_arbitrary_self_type_unfixable.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: the type of the `self` parameter does not need to be arbitrary
22
--> $DIR/needless_arbitrary_self_type_unfixable.rs:42:31
33
|
44
LL | fn call_with_mut_self(self: &mut Self) {}
5-
| ^^^^^^^^^^^^^^^ help: consider to change this parameter to: `&'_ mut self`
5+
| ^^^^^^^^^^^^^^^ help: consider to change this parameter to: `&mut self`
66
|
77
= note: `-D clippy::needless-arbitrary-self-type` implied by `-D warnings`
88

0 commit comments

Comments
 (0)