squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

placate make tidy.

Browse source
This commit is contained in:
Felix S. Klock II 2015-07-22 23:23:36 +02:00
parent 505cd8a3cc
commit abad7d6bba
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcore/intrinsics.rs
View file

@ -190,7 +190,7 @@ extern "rust-intrinsic" {
/// Drop glue is not run on the destination.
pub fn move_val_init<T>(dst: *mut T, src: T);
// SNAP ba0e1cd
// SNAP d4432b3
#[cfg(stage0)]
/// Moves a value to an uninitialized memory location.
///

12
src/libsyntax/parse/parser.rs
View file

@ -2638,7 +2638,7 @@ impl<'a> Parser<'a> {
// ... but for now: check for a place: `box(PLACE) EXPR`.
if try!(self.eat(&token::OpenDelim(token::Paren)) ){
// SNAP ba0e1cd
// SNAP d4432b3
// Enable this warning after snapshot ...
//
// let box_span = mk_sp(lo, self.last_span.hi);
@ -2659,9 +2659,15 @@ impl<'a> Parser<'a> {
self.span_err(span,
&format!("expected expression, found `{}`",
this_token_to_string));
// Spanning just keyword avoids constructing
// printout of arg expression (which starts
// with parenthesis, as established above).
let box_span = mk_sp(lo, keyword_hi);
let new_expr = format!("box () {}", pprust::expr_to_string(&place));
self.span_suggestion(box_span, "try using `box ()` instead:", new_expr);
self.span_suggestion(box_span,
"try using `box ()` instead:",
format!("box ()"));
self.abort_if_errors();
}
let subexpression = try!(self.parse_prefix_expr());