Self overlapping error message ("unexpected tokenxpected")

[est31]

This (invalid) code:

impl S {
	pub
}

Produces the following, okay error message on beta:

rustc 1.17.0-beta.3 (ca3d11832 2017-04-05)
error: expected one of `(`, `const`, `default`, `extern`, `fn`, `type`, or `unsafe`, found `}`
 --> <anon>:3:1
  |
3 | }
  | ^

error: aborting due to previous error

But on nightly, you get a bad, self overriding one:

rustc 1.18.0-nightly (50c186419 2017-04-06)
error: expected one of `(`, `const`, `default`, `extern`, `fn`, `type`, or `unsafe`, found `}`
 --> <anon>:3:1
  |
2 |   	pub
  |  _____- starting here...
3 | | }
  | | ^.unexpected tokenxpected one of 7 possible tokens here

error: aborting due to previous error

Note the "unexpected tokenxpected one of 7 possible tokens here". Possibly the "starting here" is not required either.

cc @estebank

[estebank]

There might be two problems:

• Span::next_point might not be correct.
• The label renderer isn't properly accounting for malformed spans like the one possibly being used here.

[ben0x539]

Ran into this with what minifies to

  ()
  let _ = ();

  |
2 |       ()
  |  _______- starting here...
3 | |     let _ = ();
  | |  ...^^^iunexpected tokend one of `.`, `;`, `?`, `}`, or an operator here

or

  f()
  g();

2 |       f()
  |  ________- starting here...
3 | |     g();
  | |  ...^nunexpected tokented one of `.`, `;`, `?`, `}`, or an operator here

Adding these because I almost filed a duplicate issue because searching for "iunexpected tokend" didn't give any results.

[est31]

Thanks @estebank for the quick fix!