Skip to content

Commit d67caa6

Browse files
tyrone-wutyrone-wu
committed
Trim extra whitespace in fn ptr suggestion span
Trim extra whitespace when suggesting removal of invalid qualifiers when parsing function pointer type. Fixes: #133083 Signed-off-by: Tyrone Wu <[email protected]>
1 parent ce40196 commit d67caa6

File tree

5 files changed

+96
-52
lines changed

5 files changed

+96
-52
lines changed

‎compiler/rustc_parse/src/errors.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2795,19 +2795,21 @@ pub(crate) struct DynAfterMut {
27952795
pub(crate) struct FnPointerCannotBeConst {
27962796
#[primary_span]
27972797
pub span: Span,
2798-
#[suggestion(code = "", applicability = "maybe-incorrect", style = "verbose")]
27992798
#[label]
28002799
pub qualifier: Span,
2800+
#[suggestion(code = "", applicability = "maybe-incorrect", style = "verbose")]
2801+
pub suggestion: Span,
28012802
}
28022803

28032804
#[derive(Diagnostic)]
28042805
#[diag(parse_fn_pointer_cannot_be_async)]
28052806
pub(crate) struct FnPointerCannotBeAsync {
28062807
#[primary_span]
28072808
pub span: Span,
2808-
#[suggestion(code = "", applicability = "maybe-incorrect", style = "verbose")]
28092809
#[label]
28102810
pub qualifier: Span,
2811+
#[suggestion(code = "", applicability = "maybe-incorrect", style = "verbose")]
2812+
pub suggestion: Span,
28112813
}
28122814

28132815
#[derive(Diagnostic)]

‎compiler/rustc_parse/src/parser/ty.rs‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -596,16 +596,58 @@ impl<'a> Parser<'a> {
596596
let span_start = self.token.span;
597597
let ast::FnHeader { ext, safety, constness, coroutine_kind } =
598598
self.parse_fn_front_matter(&inherited_vis, Case::Sensitive)?;
599+
let fn_start_lo = self.prev_token.span.lo();
599600
if self.may_recover() && self.token == TokenKind::Lt {
600601
self.recover_fn_ptr_with_generics(lo, &mut params, param_insertion_point)?;
601602
}
602603
let decl = self.parse_fn_decl(|_| false, AllowPlus::No, recover_return_sign)?;
603604
let whole_span = lo.to(self.prev_token.span);
604-
if let ast::Const::Yes(span) = constness {
605-
self.dcx().emit_err(FnPointerCannotBeConst { span: whole_span, qualifier: span });
605+
606+
// Order/parsing of "front matter" follows:
607+
// `<constness> <coroutine_kind> <safety> <extern> fn()`
608+
// ^ ^ ^ ^ ^
609+
// | | | | fn_start_lo
610+
// | | | ext_sp.lo
611+
// | | safety_sp.lo
612+
// | coroutine_sp.lo
613+
// const_sp.lo
614+
if let ast::Const::Yes(const_span) = constness {
615+
let next_token_lo = if let Some(
616+
ast::CoroutineKind::Async { span, .. }
617+
| ast::CoroutineKind::Gen { span, .. }
618+
| ast::CoroutineKind::AsyncGen { span, .. },
619+
) = coroutine_kind
620+
{
621+
span.lo()
622+
} else if let ast::Safety::Unsafe(span) | ast::Safety::Safe(span) = safety {
623+
span.lo()
624+
} else if let ast::Extern::Implicit(span) | ast::Extern::Explicit(_, span) = ext {
625+
span.lo()
626+
} else {
627+
fn_start_lo
628+
};
629+
let sugg_span = const_span.with_hi(next_token_lo);
630+
self.dcx().emit_err(FnPointerCannotBeConst {
631+
span: whole_span,
632+
qualifier: const_span,
633+
suggestion: sugg_span,
634+
});
606635
}
607-
if let Some(ast::CoroutineKind::Async { span, .. }) = coroutine_kind {
608-
self.dcx().emit_err(FnPointerCannotBeAsync { span: whole_span, qualifier: span });
636+
if let Some(ast::CoroutineKind::Async { span: async_span, .. }) = coroutine_kind {
637+
let next_token_lo = if let ast::Safety::Unsafe(span) | ast::Safety::Safe(span) = safety
638+
{
639+
span.lo()
640+
} else if let ast::Extern::Implicit(span) | ast::Extern::Explicit(_, span) = ext {
641+
span.lo()
642+
} else {
643+
fn_start_lo
644+
};
645+
let sugg_span = async_span.with_hi(next_token_lo);
646+
self.dcx().emit_err(FnPointerCannotBeAsync {
647+
span: whole_span,
648+
qualifier: async_span,
649+
suggestion: sugg_span,
650+
});
609651
}
610652
// FIXME(gen_blocks): emit a similar error for `gen fn()`
611653
let decl_span = span_start.to(self.prev_token.span);

‎tests/ui/parser/bad-fn-ptr-qualifier.fixed‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
//@ edition:2018
33
// Most of items are taken from ./recover-const-async-fn-ptr.rs but this is able to apply rustfix.
44

5-
pub type T0 = fn(); //~ ERROR an `fn` pointer type cannot be `const`
6-
pub type T1 = extern "C" fn(); //~ ERROR an `fn` pointer type cannot be `const`
7-
pub type T2 = unsafe extern fn(); //~ ERROR an `fn` pointer type cannot be `const`
8-
pub type T3 = fn(); //~ ERROR an `fn` pointer type cannot be `async`
9-
pub type T4 = extern fn(); //~ ERROR an `fn` pointer type cannot be `async`
10-
pub type T5 = unsafe extern "C" fn(); //~ ERROR an `fn` pointer type cannot be `async`
11-
pub type T6 = unsafe extern "C" fn();
5+
pub type T0 = fn(); //~ ERROR an `fn` pointer type cannot be `const`
6+
pub type T1 = extern "C" fn(); //~ ERROR an `fn` pointer type cannot be `const`
7+
pub type T2 = unsafe extern fn(); //~ ERROR an `fn` pointer type cannot be `const`
8+
pub type T3 = fn(); //~ ERROR an `fn` pointer type cannot be `async`
9+
pub type T4 = extern fn(); //~ ERROR an `fn` pointer type cannot be `async`
10+
pub type T5 = unsafe extern "C" fn(); //~ ERROR an `fn` pointer type cannot be `async`
11+
pub type T6 = unsafe extern "C" fn();
1212
//~^ ERROR an `fn` pointer type cannot be `const`
1313
//~| ERROR an `fn` pointer type cannot be `async`
1414

15-
pub type FTT0 = for<'a> fn(); //~ ERROR an `fn` pointer type cannot be `const`
16-
pub type FTT1 = for<'a> extern "C" fn(); //~ ERROR an `fn` pointer type cannot be `const`
17-
pub type FTT2 = for<'a> unsafe extern fn(); //~ ERROR an `fn` pointer type cannot be `const`
18-
pub type FTT3 = for<'a> fn(); //~ ERROR an `fn` pointer type cannot be `async`
19-
pub type FTT4 = for<'a> extern fn(); //~ ERROR an `fn` pointer type cannot be `async`
20-
pub type FTT5 = for<'a> unsafe extern "C" fn();
15+
pub type FTT0 = for<'a> fn(); //~ ERROR an `fn` pointer type cannot be `const`
16+
pub type FTT1 = for<'a> extern "C" fn(); //~ ERROR an `fn` pointer type cannot be `const`
17+
pub type FTT2 = for<'a> unsafe extern fn(); //~ ERROR an `fn` pointer type cannot be `const`
18+
pub type FTT3 = for<'a> fn(); //~ ERROR an `fn` pointer type cannot be `async`
19+
pub type FTT4 = for<'a> extern fn(); //~ ERROR an `fn` pointer type cannot be `async`
20+
pub type FTT5 = for<'a> unsafe extern "C" fn();
2121
//~^ ERROR an `fn` pointer type cannot be `async`
22-
pub type FTT6 = for<'a> unsafe extern "C" fn();
22+
pub type FTT6 = for<'a> unsafe extern "C" fn();
2323
//~^ ERROR an `fn` pointer type cannot be `const`
2424
//~| ERROR an `fn` pointer type cannot be `async`
2525

‎tests/ui/parser/bad-fn-ptr-qualifier.stderr‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | pub type T0 = const fn();
99
help: remove the `const` qualifier
1010
|
1111
LL - pub type T0 = const fn();
12-
LL + pub type T0 = fn();
12+
LL + pub type T0 = fn();
1313
|
1414

1515
error: an `fn` pointer type cannot be `const`
@@ -23,7 +23,7 @@ LL | pub type T1 = const extern "C" fn();
2323
help: remove the `const` qualifier
2424
|
2525
LL - pub type T1 = const extern "C" fn();
26-
LL + pub type T1 = extern "C" fn();
26+
LL + pub type T1 = extern "C" fn();
2727
|
2828

2929
error: an `fn` pointer type cannot be `const`
@@ -37,7 +37,7 @@ LL | pub type T2 = const unsafe extern fn();
3737
help: remove the `const` qualifier
3838
|
3939
LL - pub type T2 = const unsafe extern fn();
40-
LL + pub type T2 = unsafe extern fn();
40+
LL + pub type T2 = unsafe extern fn();
4141
|
4242

4343
error: an `fn` pointer type cannot be `async`
@@ -51,7 +51,7 @@ LL | pub type T3 = async fn();
5151
help: remove the `async` qualifier
5252
|
5353
LL - pub type T3 = async fn();
54-
LL + pub type T3 = fn();
54+
LL + pub type T3 = fn();
5555
|
5656

5757
error: an `fn` pointer type cannot be `async`
@@ -65,7 +65,7 @@ LL | pub type T4 = async extern fn();
6565
help: remove the `async` qualifier
6666
|
6767
LL - pub type T4 = async extern fn();
68-
LL + pub type T4 = extern fn();
68+
LL + pub type T4 = extern fn();
6969
|
7070

7171
error: an `fn` pointer type cannot be `async`
@@ -79,7 +79,7 @@ LL | pub type T5 = async unsafe extern "C" fn();
7979
help: remove the `async` qualifier
8080
|
8181
LL - pub type T5 = async unsafe extern "C" fn();
82-
LL + pub type T5 = unsafe extern "C" fn();
82+
LL + pub type T5 = unsafe extern "C" fn();
8383
|
8484

8585
error: an `fn` pointer type cannot be `const`
@@ -93,7 +93,7 @@ LL | pub type T6 = const async unsafe extern "C" fn();
9393
help: remove the `const` qualifier
9494
|
9595
LL - pub type T6 = const async unsafe extern "C" fn();
96-
LL + pub type T6 = async unsafe extern "C" fn();
96+
LL + pub type T6 = async unsafe extern "C" fn();
9797
|
9898

9999
error: an `fn` pointer type cannot be `async`
@@ -107,7 +107,7 @@ LL | pub type T6 = const async unsafe extern "C" fn();
107107
help: remove the `async` qualifier
108108
|
109109
LL - pub type T6 = const async unsafe extern "C" fn();
110-
LL + pub type T6 = const unsafe extern "C" fn();
110+
LL + pub type T6 = const unsafe extern "C" fn();
111111
|
112112

113113
error: an `fn` pointer type cannot be `const`
@@ -121,7 +121,7 @@ LL | pub type FTT0 = for<'a> const fn();
121121
help: remove the `const` qualifier
122122
|
123123
LL - pub type FTT0 = for<'a> const fn();
124-
LL + pub type FTT0 = for<'a> fn();
124+
LL + pub type FTT0 = for<'a> fn();
125125
|
126126

127127
error: an `fn` pointer type cannot be `const`
@@ -135,7 +135,7 @@ LL | pub type FTT1 = for<'a> const extern "C" fn();
135135
help: remove the `const` qualifier
136136
|
137137
LL - pub type FTT1 = for<'a> const extern "C" fn();
138-
LL + pub type FTT1 = for<'a> extern "C" fn();
138+
LL + pub type FTT1 = for<'a> extern "C" fn();
139139
|
140140

141141
error: an `fn` pointer type cannot be `const`
@@ -149,7 +149,7 @@ LL | pub type FTT2 = for<'a> const unsafe extern fn();
149149
help: remove the `const` qualifier
150150
|
151151
LL - pub type FTT2 = for<'a> const unsafe extern fn();
152-
LL + pub type FTT2 = for<'a> unsafe extern fn();
152+
LL + pub type FTT2 = for<'a> unsafe extern fn();
153153
|
154154

155155
error: an `fn` pointer type cannot be `async`
@@ -163,7 +163,7 @@ LL | pub type FTT3 = for<'a> async fn();
163163
help: remove the `async` qualifier
164164
|
165165
LL - pub type FTT3 = for<'a> async fn();
166-
LL + pub type FTT3 = for<'a> fn();
166+
LL + pub type FTT3 = for<'a> fn();
167167
|
168168

169169
error: an `fn` pointer type cannot be `async`
@@ -177,7 +177,7 @@ LL | pub type FTT4 = for<'a> async extern fn();
177177
help: remove the `async` qualifier
178178
|
179179
LL - pub type FTT4 = for<'a> async extern fn();
180-
LL + pub type FTT4 = for<'a> extern fn();
180+
LL + pub type FTT4 = for<'a> extern fn();
181181
|
182182

183183
error: an `fn` pointer type cannot be `async`
@@ -191,7 +191,7 @@ LL | pub type FTT5 = for<'a> async unsafe extern "C" fn();
191191
help: remove the `async` qualifier
192192
|
193193
LL - pub type FTT5 = for<'a> async unsafe extern "C" fn();
194-
LL + pub type FTT5 = for<'a> unsafe extern "C" fn();
194+
LL + pub type FTT5 = for<'a> unsafe extern "C" fn();
195195
|
196196

197197
error: an `fn` pointer type cannot be `const`
@@ -205,7 +205,7 @@ LL | pub type FTT6 = for<'a> const async unsafe extern "C" fn();
205205
help: remove the `const` qualifier
206206
|
207207
LL - pub type FTT6 = for<'a> const async unsafe extern "C" fn();
208-
LL + pub type FTT6 = for<'a> async unsafe extern "C" fn();
208+
LL + pub type FTT6 = for<'a> async unsafe extern "C" fn();
209209
|
210210

211211
error: an `fn` pointer type cannot be `async`
@@ -219,7 +219,7 @@ LL | pub type FTT6 = for<'a> const async unsafe extern "C" fn();
219219
help: remove the `async` qualifier
220220
|
221221
LL - pub type FTT6 = for<'a> const async unsafe extern "C" fn();
222-
LL + pub type FTT6 = for<'a> const unsafe extern "C" fn();
222+
LL + pub type FTT6 = for<'a> const unsafe extern "C" fn();
223223
|
224224

225225
error: aborting due to 16 previous errors

0 commit comments

Comments
 (0)