Skip to content

Delete features which are easily removed, in libsyntax #41729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/libsyntax/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ crate-type = ["dylib"]
[dependencies]
serialize = { path = "../libserialize" }
log = "0.3"
rustc_bitflags = { path = "../librustc_bitflags" }
bitflags = "0.8"
syntax_pos = { path = "../libsyntax_pos" }
rustc_errors = { path = "../librustc_errors" }
rustc_data_structures = { path = "../librustc_data_structures" }
7 changes: 1 addition & 6 deletions src/libsyntax/lib.rs
Original file line number Diff line number Diff line change
@@ -24,20 +24,15 @@
test(attr(deny(warnings))))]
#![deny(warnings)]

#![feature(associated_consts)]
#![feature(const_fn)]
#![feature(optin_builtin_traits)]
#![feature(rustc_private)]
#![feature(staged_api)]
#![feature(str_escape)]
#![feature(unicode)]
#![feature(rustc_diagnostic_macros)]
#![feature(specialization)]
#![feature(i128_type)]

extern crate serialize;
#[macro_use] extern crate log;
#[macro_use] #[no_link] extern crate rustc_bitflags;
#[macro_use] extern crate bitflags;
extern crate std_unicode;
pub extern crate rustc_errors as errors;
extern crate syntax_pos;
8 changes: 6 additions & 2 deletions src/libsyntax/parse/mod.rs
Original file line number Diff line number Diff line change
@@ -261,10 +261,14 @@ pub fn char_lit(lit: &str) -> (char, isize) {
}
}

pub fn escape_default(s: &str) -> String {
s.chars().map(char::escape_default).flat_map(|x| x).collect()
}

/// Parse a string representing a string literal into its final form. Does
/// unescaping.
pub fn str_lit(lit: &str) -> String {
debug!("parse_str_lit: given {}", lit.escape_default());
debug!("parse_str_lit: given {}", escape_default(lit));
let mut res = String::with_capacity(lit.len());

// FIXME #8372: This could be a for-loop if it didn't borrow the iterator
@@ -339,7 +343,7 @@ pub fn str_lit(lit: &str) -> String {
/// Parse a string representing a raw string literal into its final form. The
/// only operation this does is convert embedded CRLF into a single LF.
pub fn raw_str_lit(lit: &str) -> String {
debug!("raw_str_lit: given {}", lit.escape_default());
debug!("raw_str_lit: given {}", escape_default(lit));
let mut res = String::with_capacity(lit.len());

// FIXME #8372: This could be a for-loop if it didn't borrow the iterator
40 changes: 20 additions & 20 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ use std::path::{self, Path, PathBuf};
use std::slice;

bitflags! {
flags Restrictions: u8 {
pub flags Restrictions: u8 {
const RESTRICTION_STMT_EXPR = 1 << 0,
const RESTRICTION_NO_STRUCT_LITERAL = 1 << 1,
}
@@ -2291,7 +2291,7 @@ impl<'a> Parser<'a> {
let e = if self.token.can_begin_expr()
&& !(self.token == token::OpenDelim(token::Brace)
&& self.restrictions.contains(
Restrictions::RESTRICTION_NO_STRUCT_LITERAL)) {
RESTRICTION_NO_STRUCT_LITERAL)) {
Some(self.parse_expr()?)
} else {
None
@@ -2318,7 +2318,7 @@ impl<'a> Parser<'a> {
// This is a struct literal, unless we're prohibited
// from parsing struct literals here.
let prohibited = self.restrictions.contains(
Restrictions::RESTRICTION_NO_STRUCT_LITERAL
RESTRICTION_NO_STRUCT_LITERAL
);
if !prohibited {
return self.parse_struct_expr(lo, pth, attrs);
@@ -2722,7 +2722,7 @@ impl<'a> Parser<'a> {
token::Ident(..) if self.token.is_keyword(keywords::In) => {
self.bump();
let place = self.parse_expr_res(
Restrictions::RESTRICTION_NO_STRUCT_LITERAL,
RESTRICTION_NO_STRUCT_LITERAL,
None,
)?;
let blk = self.parse_block()?;
@@ -2785,7 +2785,7 @@ impl<'a> Parser<'a> {

let cur_op_span = self.span;
let restrictions = if op.is_assign_like() {
self.restrictions & Restrictions::RESTRICTION_NO_STRUCT_LITERAL
self.restrictions & RESTRICTION_NO_STRUCT_LITERAL
} else {
self.restrictions
};
@@ -2835,21 +2835,21 @@ impl<'a> Parser<'a> {

let rhs = match op.fixity() {
Fixity::Right => self.with_res(
restrictions - Restrictions::RESTRICTION_STMT_EXPR,
restrictions - RESTRICTION_STMT_EXPR,
|this| {
this.parse_assoc_expr_with(op.precedence(),
LhsExpr::NotYetParsed)
}),
Fixity::Left => self.with_res(
restrictions - Restrictions::RESTRICTION_STMT_EXPR,
restrictions - RESTRICTION_STMT_EXPR,
|this| {
this.parse_assoc_expr_with(op.precedence() + 1,
LhsExpr::NotYetParsed)
}),
// We currently have no non-associative operators that are not handled above by
// the special cases. The code is here only for future convenience.
Fixity::None => self.with_res(
restrictions - Restrictions::RESTRICTION_STMT_EXPR,
restrictions - RESTRICTION_STMT_EXPR,
|this| {
this.parse_assoc_expr_with(op.precedence() + 1,
LhsExpr::NotYetParsed)
@@ -2959,7 +2959,7 @@ impl<'a> Parser<'a> {
if self.token.can_begin_expr() {
// parse `for i in 1.. { }` as infinite loop, not as `for i in (1..{})`.
if self.token == token::OpenDelim(token::Brace) {
return !self.restrictions.contains(Restrictions::RESTRICTION_NO_STRUCT_LITERAL);
return !self.restrictions.contains(RESTRICTION_NO_STRUCT_LITERAL);
}
true
} else {
@@ -2973,7 +2973,7 @@ impl<'a> Parser<'a> {
return self.parse_if_let_expr(attrs);
}
let lo = self.prev_span;
let cond = self.parse_expr_res(Restrictions::RESTRICTION_NO_STRUCT_LITERAL, None)?;
let cond = self.parse_expr_res(RESTRICTION_NO_STRUCT_LITERAL, None)?;
let thn = self.parse_block()?;
let mut els: Option<P<Expr>> = None;
let mut hi = thn.span;
@@ -2992,7 +2992,7 @@ impl<'a> Parser<'a> {
self.expect_keyword(keywords::Let)?;
let pat = self.parse_pat()?;
self.expect(&token::Eq)?;
let expr = self.parse_expr_res(Restrictions::RESTRICTION_NO_STRUCT_LITERAL, None)?;
let expr = self.parse_expr_res(RESTRICTION_NO_STRUCT_LITERAL, None)?;
let thn = self.parse_block()?;
let (hi, els) = if self.eat_keyword(keywords::Else) {
let expr = self.parse_else_expr()?;
@@ -3046,7 +3046,7 @@ impl<'a> Parser<'a> {

let pat = self.parse_pat()?;
self.expect_keyword(keywords::In)?;
let expr = self.parse_expr_res(Restrictions::RESTRICTION_NO_STRUCT_LITERAL, None)?;
let expr = self.parse_expr_res(RESTRICTION_NO_STRUCT_LITERAL, None)?;
let (iattrs, loop_block) = self.parse_inner_attrs_and_block()?;
attrs.extend(iattrs);

@@ -3061,7 +3061,7 @@ impl<'a> Parser<'a> {
if self.token.is_keyword(keywords::Let) {
return self.parse_while_let_expr(opt_ident, span_lo, attrs);
}
let cond = self.parse_expr_res(Restrictions::RESTRICTION_NO_STRUCT_LITERAL, None)?;
let cond = self.parse_expr_res(RESTRICTION_NO_STRUCT_LITERAL, None)?;
let (iattrs, body) = self.parse_inner_attrs_and_block()?;
attrs.extend(iattrs);
let span = span_lo.to(body.span);
@@ -3075,7 +3075,7 @@ impl<'a> Parser<'a> {
self.expect_keyword(keywords::Let)?;
let pat = self.parse_pat()?;
self.expect(&token::Eq)?;
let expr = self.parse_expr_res(Restrictions::RESTRICTION_NO_STRUCT_LITERAL, None)?;
let expr = self.parse_expr_res(RESTRICTION_NO_STRUCT_LITERAL, None)?;
let (iattrs, body) = self.parse_inner_attrs_and_block()?;
attrs.extend(iattrs);
let span = span_lo.to(body.span);
@@ -3105,7 +3105,7 @@ impl<'a> Parser<'a> {
fn parse_match_expr(&mut self, mut attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
let match_span = self.prev_span;
let lo = self.prev_span;
let discriminant = self.parse_expr_res(Restrictions::RESTRICTION_NO_STRUCT_LITERAL,
let discriminant = self.parse_expr_res(RESTRICTION_NO_STRUCT_LITERAL,
None)?;
if let Err(mut e) = self.expect(&token::OpenDelim(token::Brace)) {
if self.token == token::Token::Semi {
@@ -3146,7 +3146,7 @@ impl<'a> Parser<'a> {
guard = Some(self.parse_expr()?);
}
self.expect(&token::FatArrow)?;
let expr = self.parse_expr_res(Restrictions::RESTRICTION_STMT_EXPR, None)?;
let expr = self.parse_expr_res(RESTRICTION_STMT_EXPR, None)?;

let require_comma =
!classify::expr_is_simple_block(&expr)
@@ -3727,7 +3727,7 @@ impl<'a> Parser<'a> {
self.look_ahead(2, |t| *t == token::OpenDelim(token::Brace)) &&

// prevent `while catch {} {}`, `if catch {} {} else {}`, etc.
!self.restrictions.contains(Restrictions::RESTRICTION_NO_STRUCT_LITERAL)
!self.restrictions.contains(RESTRICTION_NO_STRUCT_LITERAL)
}

fn is_union_item(&self) -> bool {
@@ -3799,7 +3799,7 @@ impl<'a> Parser<'a> {
self.mk_expr(lo.to(hi), ExprKind::Path(None, pth), ThinVec::new())
};

let expr = self.with_res(Restrictions::RESTRICTION_STMT_EXPR, |this| {
let expr = self.with_res(RESTRICTION_STMT_EXPR, |this| {
let expr = this.parse_dot_or_call_expr_with(expr, lo, attrs.into())?;
this.parse_assoc_expr_with(0, LhsExpr::AlreadyParsed(expr))
})?;
@@ -3939,7 +3939,7 @@ impl<'a> Parser<'a> {

// Remainder are line-expr stmts.
let e = self.parse_expr_res(
Restrictions::RESTRICTION_STMT_EXPR, Some(attrs.into()))?;
RESTRICTION_STMT_EXPR, Some(attrs.into()))?;
Stmt {
id: ast::DUMMY_NODE_ID,
span: lo.to(e.span),
@@ -3952,7 +3952,7 @@ impl<'a> Parser<'a> {

/// Is this expression a successfully-parsed statement?
fn expr_is_complete(&mut self, e: &Expr) -> bool {
self.restrictions.contains(Restrictions::RESTRICTION_STMT_EXPR) &&
self.restrictions.contains(RESTRICTION_STMT_EXPR) &&
!classify::expr_requires_semi_to_be_stmt(e)
}

2 changes: 1 addition & 1 deletion src/libsyntax/print/pprust.rs
Original file line number Diff line number Diff line change
@@ -677,7 +677,7 @@ pub trait PrintState<'a> {
style: ast::StrStyle) -> io::Result<()> {
let st = match style {
ast::StrStyle::Cooked => {
(format!("\"{}\"", st.escape_default()))
(format!("\"{}\"", parse::escape_default(st)))
}
ast::StrStyle::Raw(n) => {
(format!("r{delim}\"{string}\"{delim}",