Skip to content

Commit 700a632

Browse files
authored
Update syn to v3.0 (#51)
* Update to syn v3.0 * Update MSRV to 1.71 * Add MSRV check build * Resolve clippy warnings in tests
1 parent 765d687 commit 700a632

6 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ jobs:
2525
- run: cargo install cargo-expand
2626
- run: cargo test --verbose
2727

28+
msrv:
29+
name: MSRV
30+
runs-on: ubuntu-latest
31+
steps:
32+
- uses: actions/checkout@v3
33+
- uses: dtolnay/[email protected]
34+
# Only the library is covered by rust-version; dev-dependencies need a newer toolchain.
35+
- run: cargo check --lib
36+
2837
fmt:
2938
name: Fmt
3039
runs-on: ubuntu-latest
@@ -43,7 +52,7 @@ jobs:
4352
- uses: dtolnay/rust-toolchain@nightly
4453
with:
4554
components: clippy
46-
- run: cargo clippy -- -Dwarnings
55+
- run: cargo clippy --all-targets -- -Dwarnings
4756

4857
outdated:
4958
name: Outdated

‎Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "async-recursion"
33
version = "1.1.1"
44
authors = ["Robert Usher <[email protected]>"]
55
edition = "2018"
6+
rust-version = "1.71"
67
license = "MIT OR Apache-2.0"
78
description = "Recursion for async functions"
89
repository = "https://github.com/dcchut/async-recursion"
@@ -15,7 +16,7 @@ proc-macro = true
1516
[dependencies]
1617
proc-macro2 = { version = "1.0", default-features = false }
1718
quote = { version = "1.0", default-features = false }
18-
syn = { version = "2.0", features = ["full", "visit-mut", "parsing", "printing", "proc-macro", "clone-impls"], default-features = false }
19+
syn = { version = "3.0", features = ["full", "visit-mut", "parsing", "printing", "proc-macro", "clone-impls"], default-features = false }
1920

2021
[dev-dependencies]
2122
futures-executor = "0.3"

‎src/expand.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use proc_macro2::{Span, TokenStream};
22
use quote::{quote, ToTokens};
33
use syn::{
44
parse_quote, punctuated::Punctuated, visit_mut::VisitMut, Block, Lifetime, Receiver,
5-
ReturnType, Signature, TypeReference, WhereClause,
5+
ReceiverKind, ReturnType, Signature, TypeReference, WhereClause,
66
};
77

88
use crate::parse::{AsyncItem, RecursionArgs};
@@ -50,22 +50,21 @@ struct ReferenceVisitor {
5050

5151
impl VisitMut for ReferenceVisitor {
5252
fn visit_receiver_mut(&mut self, receiver: &mut Receiver) {
53-
self.self_lifetime = Some(if let Some((_, lt)) = &mut receiver.reference {
54-
self.self_receiver = true;
55-
56-
if let Some(lt) = lt {
57-
lt.clone()
58-
} else {
59-
// Use 'life_self to avoid collisions with 'life<count> lifetimes.
60-
let new_lifetime: Lifetime = parse_quote!('life_self);
61-
lt.replace(new_lifetime.clone());
62-
63-
self.self_receiver_new_lifetime = true;
53+
// TODO: Support ReceiverKind::Typed as well
54+
let ReceiverKind::Reference(_, lt, _) = &mut receiver.kind else {
55+
return;
56+
};
6457

65-
new_lifetime
66-
}
58+
self.self_receiver = true;
59+
self.self_lifetime = Some(if let Some(lt) = lt {
60+
lt.clone()
6761
} else {
68-
return;
62+
// Use 'life_self to avoid collisions with 'life<count> lifetimes.
63+
let new_lifetime: Lifetime = parse_quote!('life_self);
64+
lt.replace(new_lifetime.clone());
65+
66+
self.self_receiver_new_lifetime = true;
67+
new_lifetime
6968
});
7069
}
7170

@@ -127,7 +126,8 @@ fn transform_sig(sig: &mut Signature, args: &RecursionArgs) {
127126

128127
// Add an S : 'async_recursion bound to any generic parameter
129128
for param in sig.generics.type_params() {
130-
let ident = param.ident.clone();
129+
let mut ident = param.ident.clone();
130+
ident.set_span(Span::call_site());
131131
where_clause_generics.push(ident);
132132
requires_lifetime = true;
133133
}

‎tests/generic_parameters.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ pub async fn generic_parameter<S: ThirtySeven + Send>(mut x: S) -> u64 {
3333
}
3434
}
3535

36+
// x is only used in the recursive call, but we need it to test a non-Send T under ?Send
37+
#[allow(clippy::only_used_in_recursion)]
3638
#[async_recursion(?Send)]
3739
pub async fn generic_parameter_no_send<T>(x: T, y: u64) -> u64 {
3840
if y > 0 {

‎tests/lifetimes.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ async fn contains_value_2<'a, 'b, T: PartialEq>(value: &'b T, node: &'b Node<'a,
3434
contains_value(value, node).await
3535
}
3636

37-
// The reference inside foo needs a `async_recursion bound
37+
// The reference inside name needs a `async_recursion bound
3838
#[async_recursion]
39-
async fn count_down(foo: Option<&str>) -> i32 {
40-
let _ = foo;
39+
async fn count_down(name: Option<&str>) -> i32 {
40+
let _ = name;
4141
0
4242
}
4343

@@ -63,17 +63,17 @@ fn lifetime_expansion_works() {
6363
node.left = Some(&left);
6464
node.right = Some(&right);
6565

66-
assert_eq!(contains_value(&3, &node).await, true);
67-
assert_eq!(contains_value(&4, &node).await, false);
68-
assert_eq!(contains_value(&17, &node).await, true);
69-
assert_eq!(contains_value(&13, &node).await, true);
70-
assert_eq!(contains_value(&12, &node).await, false);
66+
assert!(contains_value(&3, &node).await);
67+
assert!(!contains_value(&4, &node).await);
68+
assert!(contains_value(&17, &node).await);
69+
assert!(contains_value(&13, &node).await);
70+
assert!(!contains_value(&12, &node).await);
7171

72-
assert_eq!(contains_value_2(&3, &node).await, true);
73-
assert_eq!(contains_value_2(&4, &node).await, false);
74-
assert_eq!(contains_value_2(&17, &node).await, true);
75-
assert_eq!(contains_value_2(&13, &node).await, true);
76-
assert_eq!(contains_value_2(&12, &node).await, false);
72+
assert!(contains_value_2(&3, &node).await);
73+
assert!(!contains_value_2(&4, &node).await);
74+
assert!(contains_value_2(&17, &node).await);
75+
assert!(contains_value_2(&13, &node).await);
76+
assert!(!contains_value_2(&12, &node).await);
7777

7878
count_down(None).await;
7979
explicit_async_recursion_bound(None).await;

‎tests/struct_methods.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ fn struct_method_with_generic_parameter_works() {
6969
block_on(async move {
7070
let e = Empty {};
7171
assert_eq!(
72-
e.generic_parameter::<*const u64>(&(0 as *const u64)).await,
72+
e.generic_parameter::<*const u64>(&std::ptr::null::<u64>())
73+
.await,
7374
0
7475
);
7576
})

0 commit comments

Comments
 (0)