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

Undo debug statements

Browse source
This commit is contained in:
Theodore Luo Wang 2021-09-01 12:02:11 -04:00
parent ce9e76528a
commit bc9877c5af
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_parse/src/parser/expr.rs
View file

@ -23,8 +23,6 @@ use rustc_span::symbol::{kw, sym, Ident, Symbol};
use rustc_span::{BytePos, Pos}; use rustc_span::{BytePos, Pos};
use std::mem; use std::mem;
use tracing::debug;
/// Possibly accepts an `token::Interpolated` expression (a pre-parsed expression /// Possibly accepts an `token::Interpolated` expression (a pre-parsed expression
/// dropped into the token stream, which happens while parsing the result of /// dropped into the token stream, which happens while parsing the result of
/// macro expansion). Placement of these is not as complex as I feared it would /// macro expansion). Placement of these is not as complex as I feared it would
@ -165,12 +163,9 @@ impl<'a> Parser<'a> {
if [token::DotDot, token::DotDotDot, token::DotDotEq].contains(&self.token.kind) { if [token::DotDot, token::DotDotDot, token::DotDotEq].contains(&self.token.kind) {
return self.parse_prefix_range_expr(attrs); return self.parse_prefix_range_expr(attrs);
} else { } else {
let result = self.parse_prefix_expr(attrs); self.parse_prefix_expr(attrs)?
debug!("parse_prefix_expr result: {:?}", &result);
result?
} }
}; };
debug!("parse_assoc_expr_with(lhs = {:?})", &lhs);
let last_type_ascription_set = self.last_type_ascription.is_some(); let last_type_ascription_set = self.last_type_ascription.is_some();
if !self.should_continue_as_assoc_expr(&lhs) { if !self.should_continue_as_assoc_expr(&lhs) {
@ -178,11 +173,8 @@ impl<'a> Parser<'a> {
return Ok(lhs); return Ok(lhs);
} }
debug!("continue_as_assoc_expr");
self.expected_tokens.push(TokenType::Operator); self.expected_tokens.push(TokenType::Operator);
while let Some(op) = self.check_assoc_op() { while let Some(op) = self.check_assoc_op() {
debug!("op: {:?}", op);
// Adjust the span for interpolated LHS to point to the `$lhs` token // Adjust the span for interpolated LHS to point to the `$lhs` token
// and not to what it refers to. // and not to what it refers to.
let lhs_span = match self.prev_token.kind { let lhs_span = match self.prev_token.kind {
@ -363,7 +355,6 @@ impl<'a> Parser<'a> {
/// but the next token implies this should be parsed as an expression. /// but the next token implies this should be parsed as an expression.
/// For example: `if let Some(x) = x { x } else { 0 } / 2`. /// For example: `if let Some(x) = x { x } else { 0 } / 2`.
fn error_found_expr_would_be_stmt(&self, lhs: &Expr) { fn error_found_expr_would_be_stmt(&self, lhs: &Expr) {
debug!("error_found_expr_would_be_stmt(lhs: {:?})", lhs);
let mut err = self.struct_span_err( let mut err = self.struct_span_err(
self.token.span, self.token.span,
&format!("expected expression, found `{}`", pprust::token_to_string(&self.token),), &format!("expected expression, found `{}`", pprust::token_to_string(&self.token),),
@ -526,7 +517,6 @@ impl<'a> Parser<'a> {
make_it!(this, attrs, |this, _| this.parse_borrow_expr(lo)) make_it!(this, attrs, |this, _| this.parse_borrow_expr(lo))
} }
token::BinOp(token::Plus) => { token::BinOp(token::Plus) => {
debug!("leading + detected: {:?}", lo);
let mut err = this.struct_span_err(lo, "leading `+` is not supported"); let mut err = this.struct_span_err(lo, "leading `+` is not supported");
err.span_label(lo, "unexpected `+`"); err.span_label(lo, "unexpected `+`");

3
compiler/rustc_parse/src/parser/stmt.rs
View file

@ -21,8 +21,6 @@ use rustc_span::symbol::{kw, sym};
use std::mem; use std::mem;
use tracing::debug;
impl<'a> Parser<'a> { impl<'a> Parser<'a> {
/// Parses a statement. This stops just before trailing semicolons on everything but items. /// Parses a statement. This stops just before trailing semicolons on everything but items.
/// e.g., a `StmtKind::Semi` parses to a `StmtKind::Expr`, leaving the trailing `;` unconsumed. /// e.g., a `StmtKind::Semi` parses to a `StmtKind::Expr`, leaving the trailing `;` unconsumed.
@ -420,7 +418,6 @@ impl<'a> Parser<'a> {
if self.token == token::Eof { if self.token == token::Eof {
break; break;
} }
debug!("parsing statements, stmts: {:?}", &stmts);
let stmt = match self.parse_full_stmt(recover) { let stmt = match self.parse_full_stmt(recover) {
Err(mut err) if recover.yes() => { Err(mut err) if recover.yes() => {
self.maybe_annotate_with_ascription(&mut err, false); self.maybe_annotate_with_ascription(&mut err, false);