8000 Fix more lints · rune-rs/rune@66b4976 · GitHub
[go: up one dir, main page]
Skip to content

Commit 66b4976

Browse files
udoprogudoprog
committed
Fix more lints
1 parent 1a7a406 commit 66b4976

File tree

5 files changed

+30
-47
lines changed

5 files changed

+30
-47
lines changed

‎crates/rune-alloc-macros/src/try_clone.rs

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -75,34 +75,32 @@ pub(super) fn expand(mut input: syn::DeriveInput) -> Result<TokenStream, Vec<syn
7575
(index, f, member, var, attr)
7676
});
7777

78-
let assigns =
79-
members
80-
.clone()
81-
.map(|(index, f, member, var, _)| match &f.ident {
82-
Some(..) => syn::FieldValue {
83-
attrs: Vec::new(),
84-
member,
85-
colon_token: None,
86-
expr: syn::Expr::Verbatim(quote!()),
87-
},
88-
None => {
89-
let member = syn::Member::Unnamed(syn::Index::from(index));
90-
91-
let expr = syn::Expr::Path(syn::ExprPath {
92-
attrs: Vec::new(),
93-
qself: None,
94-
path: syn::Path::from(var),
95-
});
96-
97-
syn::FieldValue {
98-
attrs: Vec::new(),
99-
member,
100-
colon_token: Some(<syn::Token![:]>::default()),
101-
expr,
102-
}
103-
}
78+
let assigns = members.clone().map(|(index, f, member, var, _)| {
79+
if f.ident.is_some() {
80+
syn::FieldValue {
81+
attrs: Vec::new(),
82+
member,
83+
colon_token: None,
84+
expr: syn::Expr::Verbatim(quote!()),
85+
}
86+
} else {
87+
let member = syn::Member::Unnamed(syn::Index::from(index));
88+
89+
let expr = syn::Expr::Path(syn::ExprPath {
90+
attrs: Vec::new(),
91+
qself: None,
92+
path: syn::Path::from(var),
10493
});
10594

95+
syn::FieldValue {
96+
attrs: Vec::new(),
97+
member,
98+
colon_token: Some(<syn::Token![:]>::default()),
99+
expr,
100+
}
101+
}
102+
});
103+
106104
let fields = members.clone().map(|(_, _, member, var, attr)| {
107105
let expr = match attr.with {
108106
With::Copy => quote! { *#var },

‎crates/rune-alloc/src/btree/navigate.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,10 +521,7 @@ impl<BorrowType: marker::BorrowType, K, V>
521521
loop {
522522
edge = match edge.right_kv() {
523523
Ok(internal_kv) => return Ok(internal_kv),
524-
Err(last_edge) => match last_edge.into_node().ascend() {
525-
Ok(parent_edge) => parent_edge,
526-
Err(root) => return Err(root),
527-
},
524+
Err(last_edge) => last_edge.into_node().ascend()?,
528525
}
529526
}
530527
}

‎crates/rune-alloc/src/hashbrown/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2289,7 +2289,7 @@ where
22892289
}
22902290

22912291
self.iter()
2292-
.all(|(key, value)| other.get(key).map_or(false, |v| *value == *v))
2292+
.all(|(key, value)| other.get(key).is_some_and(|v| *value == *v))
22932293
}
22942294
}
22952295

‎crates/rune-tracing-macros/src/instrument.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl syn::parse::Parse for Expander {
5454
}
5555

5656
impl Expander {
57-
pub fn expand(self, attr: &Attr) -> Result<TokenStream, Vec<syn::Error>> {
57+
pub(super) fn expand(self, attr: &Attr) -> TokenStream {
5858
let mut it = self.sig.inputs.iter();
5959

6060
let first = match it.next() {
@@ -97,12 +97,12 @@ impl Expander {
9797
let sig = &self.sig;
9898
let remaining = &self.remaining;
9999

100-
Ok(quote! {
100+
quote! {
101101
#(#attrs)*
102102
#vis #sig {
103103
#log
104104
#remaining
105105
}
106-
})
106+
}
107107
}
108108
}

‎crates/rune-tracing-macros/src/lib.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,7 @@ pub fn instrument_ast(
3535
) -> proc_macro::TokenStream {
3636
let attr = syn::parse_macro_input!(attr as instrument::Attr);
3737
let internal_call = syn::parse_macro_input!(item as instrument::Expander);
38-
39-
internal_call
40-
.expand(&attr)
41-
.unwrap_or_else(to_compile_errors)
42-
.into()
43-
}
44-
45-
fn to_compile_errors<I>(errors: I) -> proc_macro2::TokenStream
46-
where
47-
I: IntoIterator<Item = syn::Error>,
48-
{
49-
let compile_errors = errors.into_iter().map(syn::Error::into_compile_error);
50-
::quote::quote!(#(#compile_errors)*)
38+
internal_call.expand(&attr).into()
5139
}
5240

5341
/// Passthrough attribute macro.

0 commit comments

Comments
 (0)
0