diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-05-10 20:31:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-10 20:31:07 +0200 |
| commit | 20dff29b354e99e2675c4a1b94a7a8f3aa5bcedd (patch) | |
| tree | 9e5b6e8bac55e26fdd523bb2762aa93343dfdb5a /src/libsyntax | |
| parent | d94cb9f2ea86a088a970c6cf741efaef6fb6ed16 (diff) | |
| parent | 5b6bda33543a8db601690350c585515a5273975d (diff) | |
| download | rust-20dff29b354e99e2675c4a1b94a7a8f3aa5bcedd.tar.gz rust-20dff29b354e99e2675c4a1b94a7a8f3aa5bcedd.zip | |
Rollup merge of #60620 - mark-i-m:transcribe-2, r=petrochenkov
Fix a couple of FIXMEs in ext::tt::transcribe _Blocked on #60618_ A crater run would be nice to make sure my understanding is correct. A quick google search seems to indicate these are extremely rare errors if they are possible (which I don't believe they are). r? @petrochenkov cc #2887 (there is only one FIXME left and it is hygiene-related)
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/tt/transcribe.rs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 0cefcf1ce03..e3586c1854c 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -170,10 +170,9 @@ pub fn transcribe( } LockstepIterSize::Contradiction(ref msg) => { - // FIXME: this should be impossible. I (mark-i-m) believe it would - // represent a bug in the macro_parser. - // FIXME #2887 blame macro invoker instead - cx.span_fatal(seq.span(), &msg[..]); + // This should never happen because the macro parser should generate + // properly-sized matches for all meta-vars. + cx.span_bug(seq.span(), &msg[..]); } LockstepIterSize::Constraint(len, _) => { @@ -188,14 +187,13 @@ pub fn transcribe( // Is the repetition empty? if len == 0 { if seq.op == quoted::KleeneOp::OneOrMore { - // FIXME: this should be impossible because we check for this in - // macro_parser.rs - // FIXME #2887 blame invoker - cx.span_fatal(sp.entire(), "this must repeat at least once"); + // This should be impossible because the macro parser would not + // match the given macro arm. + cx.span_bug(sp.entire(), "this must repeat at least once"); } } else { // 0 is the initial counter (we have done 0 repretitions so far). `len` - // is the total number of reptitions we should generate. + // is the total number of reptitions we should generate. repeats.push((0, len)); // The first time we encounter the sequence we push it to the stack. It |