Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_ast_lowering/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1228,7 +1228,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
} else {
self.next_node_id()
};
let span = self.tcx.sess.source_map().next_point(t.span.shrink_to_lo());
let span = self.tcx.sess.source_map().start_point(t.span);
Lifetime { ident: Ident::new(kw::UnderscoreLifetime, span), id }
});
let lifetime = self.lower_lifetime(&region);
2 changes: 1 addition & 1 deletion compiler/rustc_resolve/src/late.rs
Original file line number Diff line number Diff line change
@@ -629,7 +629,7 @@ impl<'a: 'ast, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
// Elided lifetime in reference: we resolve as if there was some lifetime `'_` with
// NodeId `ty.id`.
// This span will be used in case of elision failure.
let span = self.r.session.source_map().next_point(ty.span.shrink_to_lo());
let span = self.r.session.source_map().start_point(ty.span);
self.resolve_elided_lifetime(ty.id, span);
visit::walk_ty(self, ty);
}
7 changes: 7 additions & 0 deletions src/test/ui/lifetimes/fullwidth-ampersand.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Verify that we do not ICE when the user uses a multubyte ampersand.

fn f(_: &()) -> &() { todo!() }
//~^ ERROR unknown start of token: \u{ff06}
//~| ERROR missing lifetime specifier [E0106]

fn main() {}
26 changes: 26 additions & 0 deletions src/test/ui/lifetimes/fullwidth-ampersand.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
error: unknown start of token: \u{ff06}
--> $DIR/fullwidth-ampersand.rs:3:10
|
LL | fn f(_: &&()) -> &() { todo!() }
| ^^
|
help: Unicode character '&' (Fullwidth Ampersand) looks like '&' (Ampersand), but it is not
|
LL | fn f(_: &&()) -> &() { todo!() }
| ~

error[E0106]: missing lifetime specifier
--> $DIR/fullwidth-ampersand.rs:3:18
|
LL | fn f(_: &&()) -> &() { todo!() }
| ----- ^ expected named lifetime parameter
|
= help: this function's return type contains a borrowed value, but the signature does not say which one of argument 1's 2 lifetimes it is borrowed from
help: consider introducing a named lifetime parameter
|
LL | fn f<'a>(_: &'a &'a ()) -> &'a () { todo!() }
| ++++ ++ ++ ++

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0106`.