From 6f5a61b5fb66987a32c25e3877f4f99e37ff067d Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Sun, 2 Feb 2020 02:39:53 +0900
Subject: [PATCH] Use `next_point` to avoid ICE
---
src/librustc_parse/parser/mod.rs | 4 ++--
src/test/ui/parser/issue-68730.rs | Bin 0 -> 170 bytes
src/test/ui/parser/issue-68730.stderr | Bin 0 -> 957 bytes
3 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 src/test/ui/parser/issue-68730.rs
create mode 100644 src/test/ui/parser/issue-68730.stderr
diff --git a/src/librustc_parse/parser/mod.rs b/src/librustc_parse/parser/mod.rs
index 4a9016394d2..7246bf307ac 100644
--- a/src/librustc_parse/parser/mod.rs
+++ b/src/librustc_parse/parser/mod.rs
@@ -671,12 +671,12 @@ impl<'a> Parser<'a> {
true
}
token::BinOp(token::Shl) => {
- let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
+ let span = self.sess.source_map().next_point(self.token.span);
self.bump_with(token::Lt, span);
true
}
token::LArrow => {
- let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
+ let span = self.sess.source_map().next_point(self.token.span);
self.bump_with(token::BinOp(token::Minus), span);
true
}
diff --git a/src/test/ui/parser/issue-68730.rs b/src/test/ui/parser/issue-68730.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b570e9417751b01f67db9a2e4edfa7631400b8d9
GIT binary patch
literal 170
zcmZw7F%E+;3`SvQPT>O(Wv{B9B@y|9EWk#N5$($LxK!!h>Am5Lk$4g{1n2SzZkZRB
zDF}|cXnl+XGqtc~cbGhAms#`>YM#wWE4j{)KM?N?qoa@telESzKxtHIeh(Ljb7j~-
bYP4{L^NNA0?ouc{Q{O}OwZqz7=XHJoQ(ip7
literal 0
HcmV?d00001
diff --git a/src/test/ui/parser/issue-68730.stderr b/src/test/ui/parser/issue-68730.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..5f9ed56e2d7e9fe3fb822cc5a40648bf6b146dd6
GIT binary patch
literal 957
zcmd5*O-sW-5bZg?;vIx4B-&Q0HH3oTMTi$aZc>salV(Y~Q})9O)=U0g{*>Ds{D7)O
zJ-F;)cV^l5=DitGid6_JE6FPfZBk{x1q@dtL)_b^-m?b;!5DiNm)A!^YfHh&==8XE
zsB}0Chc1h?7sptGq+N7q(P`?YZo@7GOgxW%i!%BaWk;MrHu$=pvz?IInoF85L)=M`
zaZbp}RHd0Ag>F-Kv46$6D1^JlWH!;53WIYe#Hyq;Kfs*1(wK{i(2d;tn6wUV%T(e<
z%;bTOsWlL8Ye+U*SViwe{;Tr)y)8%|{cJ7$4+1oG)RJ{v+V$3G^tdEvMGls<>E>jd
z_((FA+PH(rNt)IhAFP}O1sSm*9|c>PBZ(6C?dKie@9!cJCioGH*I`Mgtc;K|<d)nx
QVu+=p2f<dO9VhL1FJi|fPyhe`
literal 0
HcmV?d00001