Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweak some spans to try for meaningful click-through on method names #218

Merged
merged 1 commit into from Oct 19, 2022
Merged

Tweak some spans to try for meaningful click-through on method names #218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 14 additions & 21 deletions src/expand.rs
View file
Open in desktop
Expand Up @@ -159,19 +159,14 @@ fn transform_sig(
has_default: bool,
is_local: bool,
) {
sig.fn_token.span = sig.asyncness.take().unwrap().span;
let default_span = sig.asyncness.take().unwrap().span;
sig.fn_token.span = default_span;

let ret = match &sig.output {
ReturnType::Default => quote!(()),
ReturnType::Type(_, ret) => quote!(#ret),
let (ret_arrow, ret) = match &sig.output {
ReturnType::Default => (Token![->](default_span), quote_spanned!(default_span=> ())),
ReturnType::Type(arrow, ret) => (*arrow, quote!(#ret)),
};

let default_span = sig
.ident
.span()
.join(sig.paren_token.span)
.unwrap_or_else(|| sig.ident.span());

let mut lifetimes = CollectLifetimes::new("'life", default_span);
for arg in sig.inputs.iter_mut() {
match arg {
Expand Down Expand Up @@ -235,13 +230,12 @@ fn transform_sig(
.push(parse_quote_spanned!(default_span=> 'async_trait));

if has_self {
let bound_span = sig.ident.span();
let bound = match sig.inputs.iter().next() {
Some(FnArg::Receiver(Receiver {
reference: Some(_),
mutability: None,
..
})) => Ident::new("Sync", bound_span),
})) => Ident::new("Sync", default_span),
Some(FnArg::Typed(arg))
if match (arg.pat.as_ref(), arg.ty.as_ref()) {
(Pat::Ident(pat), Type::Reference(ty)) => {
Expand All @@ -250,9 +244,9 @@ fn transform_sig(
_ => false,
} =>
{
Ident::new("Sync", bound_span)
Ident::new("Sync", default_span)
}
_ => Ident::new("Send", bound_span),
_ => Ident::new("Send", default_span),
};

let assume_bound = match context {
Expand All @@ -262,9 +256,9 @@ fn transform_sig(

let where_clause = where_clause_or_default(&mut sig.generics.where_clause);
where_clause.predicates.push(if assume_bound || is_local {
parse_quote_spanned!(bound_span=> Self: 'async_trait)
parse_quote_spanned!(default_span=> Self: 'async_trait)
} else {
parse_quote_spanned!(bound_span=> Self: ::core::marker::#bound + 'async_trait)
parse_quote_spanned!(default_span=> Self: ::core::marker::#bound + 'async_trait)
});
}

Expand All @@ -288,14 +282,13 @@ fn transform_sig(
}
}

let ret_span = sig.ident.span();
let bounds = if is_local {
quote_spanned!(ret_span=> 'async_trait)
quote_spanned!(default_span=> 'async_trait)
} else {
quote_spanned!(ret_span=> ::core::marker::Send + 'async_trait)
quote_spanned!(default_span=> ::core::marker::Send + 'async_trait)
};
sig.output = parse_quote_spanned! {ret_span=>
-> ::core::pin::Pin<Box<
sig.output = parse_quote_spanned! {default_span=>
#ret_arrow ::core::pin::Pin<Box<
dyn ::core::future::Future<Output = #ret> + #bounds
>>
};
Expand Down