rust/src/libsyntax/parse/parser.rs, branch 1.11.0

prefer `if let` to match with `None => {}` arm in some places

2016-07-03T23:27:02+00:00

This is a spiritual succesor to #34268/8531d581, in which we replaced a number of matches of None to the unit value with `if let` conditionals where it was judged that this made for clearer/simpler code (as would be recommended by Manishearth/rust-clippy's `single_match` lint). The same rationale applies to matches of None to the empty block.

Refactor away `parser.commit_stmt_expecting()`

2016-06-29T06:40:05+00:00

Rollup merge of #34436 - jseyfried:no_block_expr, r=eddyb

2016-06-26T02:20:14+00:00

To allow these braced macro invocation, this PR removes the optional expression from `ast::Block` and instead uses a `StmtKind::Expr` at the end of the statement list. Currently, braced macro invocations in blocks can expand into statements (and items) except when they are last in a block, in which case they can only expand into expressions. For example, ```rust macro_rules! make_stmt { () => { let x = 0; } } fn f() { make_stmt! {} //< This is OK... let x = 0; //< ... unless this line is commented out. } ``` Fixes #34418.

Rollup merge of #34339 - jseyfried:thin_vec, r=petrochenkov,Manishearth

2016-06-26T02:18:43+00:00

Generalize and abstract `ThinAttributes` to `ThinVec`.

Rollup merge of #34316 - jseyfried:refactor_ast_stmt, r=eddyb

2016-06-26T02:17:27+00:00

Refactor away `ast::Decl`, refactor `ast::Stmt`, and rename `ast::ExprKind::Again` to `ast::ExprKind::Continue`.

Rollup merge of #33943 - jseyfried:libsyntax_cleanup, r=nrc

2016-06-26T02:15:04+00:00

Miscellaneous low priority cleanup in `libsyntax`.

Rollup merge of #34385 - cgswords:tstream, r=nrc

2016-06-26T02:11:59+00:00

syntax-[breaking-change] cc #31645 (Only breaking because ast::TokenTree is now tokenstream::TokenTree.) This pull request refactors TokenTrees into their own file as src/libsyntax/tokenstream.rs, moving them out of src/libsyntax/ast.rs, in order to prepare for an accompanying TokenStream implementation (per RFC 1566).

Rollup merge of #34403 - jonathandturner:move_liberror, r=alexcrichton

2016-06-25T22:35:09+00:00

This PR refactors the 'errors' part of libsyntax into its own crate (librustc_errors). This is the first part of a few refactorings to simplify error reporting and potentially support more output formats (like a standardized JSON output and possibly an --explain mode that can work with the user's code), though this PR stands on its own and doesn't assume further changes. As part of separating out the errors crate, I have also refactored the code position portion of codemap into its own crate (libsyntax_pos). While it's helpful to have the common code positions in a separate crate for the new errors crate, this may also enable further simplifications in the future.

Rollup merge of #34368 - petrochenkov:astqpath, r=Manishearth

2016-06-25T22:35:06+00:00

The AST part of https://github.com/rust-lang/rust/pull/34365 plugin-[breaking-change] cc https://github.com/rust-lang/rust/issues/31645

Rollup merge of #34213 - josephDunne:trait_item_macros, r=jseyfried

2016-06-25T22:35:01+00:00

**syntax-[breaking-change]** cc #31645 New `TraitItemKind::Macro` variant This change adds support for macro expansion inside trait items by adding the new `TraitItemKind::Macro` and associated parsing code.