rust/src/libsyntax/parse, branch 1.7.0https://github.com/rust-lang/rust
http://git.dreamy.place/mirrors/rust/atom?h=1.7.02016-01-15T06:38:26+00:00Auto merge of #30763 - gchp:issue/30033, r=nagisa2016-01-15T06:38:26+00:00borsbors@rust-lang.org2016-01-15T06:38:26+00:00urn:sha1:a70a60a02bca4c1fb75a0eb0ecf80acb73972f66
This is achieved by adding the scan_back method. This method looks back
through the source_text of the StringReader until it finds the target
char, returning it's offset in the source. We use this method to find
the offset of the opening single quote, and use that offset as the start
of the error.
Given this code:
```rust
fn main() {
let _ = 'abcd';
}
```
The compiler would give a message like:
```
error: character literal may only contain one codepoint: ';
let _ = 'abcd';
^~
```
With this change, the message now displays:
```
error: character literal may only contain one codepoint: 'abcd';
let _ = 'abcd';
^~~~~~~
```
Fixes #30033
Implement JSON error emission2016-01-14T21:24:12+00:00Nick Cameronncameron@mozilla.com2015-12-31T05:47:14+00:00urn:sha1:b976d9e6660c16f4a1d5a28b11afa7ccb4f75da6
[breaking-change]
syntax::errors::Handler::new has been renamed to with_tty_emitter
Many functions which used to take a syntax::errors::ColorConfig, now take a rustc::session::config::ErrorOutputType. If you previously used ColorConfig::Auto as a default, you should now use ErrorOutputType::default().
Display better snippet for invalid char literal2016-01-14T17:34:42+00:00Greg Chapplegregchapple1@gmail.com2016-01-07T16:12:28+00:00urn:sha1:acc9428c6a99d199f35032ec7f794385e4c9fd24
Given this code:
fn main() {
let _ = 'abcd';
}
The compiler would give a message like:
error: character literal may only contain one codepoint: ';
let _ = 'abcd';
^~
With this change, the message now displays:
error: character literal may only contain one codepoint: 'abcd'
let _ = 'abcd'
^~~~~~
Fixes #30033
Auto merge of #30813 - fhahn:fix-ice-semicolon-in-lifetime, r=nrc2016-01-13T20:38:12+00:00borsbors@rust-lang.org2016-01-13T20:38:12+00:00urn:sha1:6089ebaddb8a9d663f798c26eb2ca73a9514a59a
This PR fixes an ICE due to an DiagnosticsBuilder not being canceld or emitted.
Ideally it would use `Handler::cancel`, but I did not manage to get a `&mut` reference to the diagnostics handler.
Auto merge of #30684 - tshepang:rustfmt-lexer-part2, r=nrc2016-01-13T12:22:51+00:00borsbors@rust-lang.org2016-01-13T12:22:51+00:00urn:sha1:d3c83fef245f1cb2e523c8913b8968c98faec1f4re-instate comment that was mysteriously disappeared2016-01-12T19:00:09+00:00Tshepang Lekhonkhobetshepang@gmail.com2016-01-12T18:52:22+00:00urn:sha1:aa3b4c668e00815c5885698887bb2412f408acedCancel parse_ty error in Parser::parse_generic_values_after_lt2016-01-10T21:59:23+00:00Florian Hahnflo@fhahn.com2016-01-10T21:59:23+00:00urn:sha1:e61d21fe3d59797f0bc30ded9e943bfe9f5364e4Auto merge of #30723 - nrc:macro-err-bug, r=Manishearth2016-01-07T04:44:14+00:00borsbors@rust-lang.org2016-01-07T04:44:14+00:00urn:sha1:440671751e818dfb20525a16a00011b8227eeaa7
Fixes #30715
Rollup merge of #30729 - huonw:delete-bad-comment, r=sanxiyn2016-01-06T23:31:58+00:00Steve Klabniksteve@steveklabnik.com2016-01-06T23:31:58+00:00urn:sha1:d91518b9c4d03c763274902546ee0db48f0cd911
The fundamental problem of duplication was fixed in https://github.com/rust-lang/rust/pull/10891, but the comment was preserved. Closes https://github.com/rust-lang/rust/issues/9762.
Auto merge of #30654 - nrc:panictry, r=brson2016-01-06T20:30:55+00:00borsbors@rust-lang.org2016-01-06T20:30:55+00:00urn:sha1:5daa75373d870f255923aed37d99db73a661bd51
The motivation (other than removing boilerplate) is that this is a baby step towards a parser with error recovery.
[breaking-change] if you use any of the changed functions, you'll need to remove a try! or panictry!