auto merge of #14517 : lucy/rust/issue-14499, r=alexcrichton

Fixes #8537
Fixes #14499 (duplicate of #8537)

Old:
```rust
test.rs:2 	pub extern "xxxxx" fn add(x: int, y: int) -> int {
          	                   ^~
```

New:
```rust
test.rs:2 	pub extern "xxxxx" fn add(x: int, y: int) -> int {
          	           ^~~~~~~
```

diff --cc src/libsyntax/parse/parser.rs
Simple merge