mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #31211 - Manishearth:pr-30765, r=nrc

Browse Source 
r? @eddyb or @nrc
This commit is contained in:
Manish Goregaokar 2016-01-26 18:55:39 +05:30
commit b6faae11f4
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsyntax/errors/emitter.rs
View File

@ -10,7 +10,7 @@
use self::Destination::*;
use codemap::{self, COMMAND_LINE_SP, COMMAND_LINE_EXPN, Pos, Span};
use codemap::{self, COMMAND_LINE_SP, COMMAND_LINE_EXPN, DUMMY_SP, Pos, Span};
use diagnostics;
use errors::{Level, RenderSpan, DiagnosticBuilder};
@ -109,8 +109,8 @@ fn emit(&mut self,
lvl: Level) {
let error = match sp {
Some(COMMAND_LINE_SP) => self.emit_(FileLine(COMMAND_LINE_SP), msg, code, lvl),
Some(DUMMY_SP) | None => print_diagnostic(&mut self.dst, "", lvl, msg, code),
Some(sp) => self.emit_(FullSpan(sp), msg, code, lvl),
None => print_diagnostic(&mut self.dst, "", lvl, msg, code),
};
if let Err(e) = error {

6
src/libsyntax/parse/parser.rs
View File

@ -2218,6 +2218,12 @@ fn parse_bottom_expr(&mut self) -> PResult<'a, P<Expr>> {
ex = ExprBreak(None);
}
hi = self.last_span.hi;
} else if self.token.is_keyword(keywords::Let) {
// Catch this syntax error here, instead of in `check_strict_keywords`, so
// that we can explicitly mention that let is not to be used as an expression
let mut db = self.fatal("expected expression, found statement (`let`)");
db.note("variable declaration using `let` is a statement");
return Err(db);
} else if self.check(&token::ModSep) ||
self.token.is_ident() &&
!self.check_keyword(keywords::True) &&

2
src/test/run-fail-fulldeps/qquote.rs
View File

@ -10,7 +10,7 @@
// ignore-cross-compile
// error-pattern:expected identifier, found keyword `let`
// error-pattern:expected expression, found statement (`let`)
#![feature(quote, rustc_private)]