Batch up libsyntax breaking changes #34424

jseyfried · 2016-06-23T07:10:15Z

Batch of the following syntax-[breaking-change] changes:

Add support for macro expansion inside trait items #34213: Add a variant Macro to TraitItemKind
Merge PatKind::QPath into PatKind::Path in AST #34368: Merge the variant QPath of PatKind into the variant PatKind::Path
Factor TokenTrees into their own file in preparation for TokenStreams. #34385: Move syntax::ast::TokenTree into a new module syntax::tokenstream
libsyntax: miscellaneous cleanup #33943:
- Remove the type parameter from visit::Visitor
- Remove attr::WithAttrs -- use attr::HasAttrs instead.
- Change fold_tt/fold_tts to take token trees by value and avoid wrapping token trees in Rc.
- Remove the field ctxt of ast::Mac_
- Remove inherent method attrs() of types -- use the method attrs of HasAttrs instead.
Refactor ast::Stmt and rename ExprKind::Again to Continue #34316:
- Remove ast::Decl/ast::DeclKind and add variants Local and Item to StmtKind.
- Move the node id for statements from the StmtKind variants to a field of Stmt (making Stmt a struct instead of an alias for Spanned<StmtKind>)
- Rename ast::ExprKind::Again to Continue.
Generalize and abstract ThinAttributes to ThinVec<Attribute> #34339: Generalize and abstract ThinAttributes to ThinVec<Attribute>
- Use .into() in convert between Vec<Attribute> and ThinVec<Attribute>
- Use autoderef instead of .as_attr_slice()
Allow statement-generating braced macro invocations at the end of blocks #34436: Remove the optional expression from ast::Block and instead use a StmtKind::Expr at the end of the statement list.
Move errors from libsyntax into their own crate #34403: Move errors into a separate crate (unlikely to cause breakage)

…hod of trait `HasAttrs`.

… of by reference)

…reams. Modified tests to point to the new file now.

Manishearth · 2016-06-23T07:12:42Z

I prefer having reviewer info stick around in the merge commit somehow. I have a process for this 😄

Manishearth · 2016-06-23T07:13:20Z

you may also find this git alias useful for future stuff: fetchpr = !sh -c 'git fetch $1 pull/$2/head:pr-$2' -

jseyfried · 2016-06-23T07:15:14Z

Ok, didn't mean to disrupt your process. There were a lot of merge conflicts, mostly from my PRs, so I figured I'd take care of them. If you'd like to integrate that work from this branch into your process, feel free :)

Manishearth · 2016-06-23T07:21:43Z

Nah, it's fine. I'm okay with others doing it, just leave the reviewer info and PR text in there somehow. Especially if you've already fixed merge conflicts.

Could you use git rebase master --preserve-merges and just edit the commit text of the merge commits? I have code that does this already (not for rebases though), basically a mergerollup command in bash:

mergerollup() {
 echo "Merging $@"
 git branch -D current
 git fetch origin pull/$2/head:current
 NL="

"
 A=$(wget -O - https://api.github.com/repos/rust-lang/rust/pulls/$2 -q| grep "\"body\":"| sed  's/^  "body": "//'|sed 's/",$//'| sed 's/\\n/\n/g' | sed 's/\\r//g')

 git merge --no-ff current -m "Rollup merge of #$2 - $1, r=$3 $NL $A";
 git mergetool
}

which can be run using the code in #31645 (comment)

jseyfried · 2016-06-23T07:30:35Z

Will do.

bors · 2016-06-23T11:24:19Z

☔ The latest upstream changes (presumably #34253) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2016-06-27T18:31:13Z

📌 Commit 542ba8c has been approved by Manishearth

sophiajt · 2016-06-27T18:33:03Z

@jseyfried - thanks :)

bors · 2016-06-27T20:59:06Z

⌛ Testing commit 542ba8c with merge df7ef54...

bors · 2016-06-27T23:28:36Z

💔 Test failed - auto-linux-64-opt-rustbuild

jseyfried · 2016-06-27T23:41:54Z

@bors force r=Manishearth

bors · 2016-06-27T23:41:55Z

📌 Commit 360dcae has been approved by Manishearth

bors · 2016-06-27T23:42:03Z

⌛ Testing commit 360dcae with merge ea0dc92...

Batch up libsyntax breaking changes Batch of the following syntax-[breaking-change] changes: - #34213: Add a variant `Macro` to `TraitItemKind` - #34368: Merge the variant `QPath` of `PatKind` into the variant `PatKind::Path` - #34385: Move `syntax::ast::TokenTree` into a new module `syntax::tokenstream` - #33943: - Remove the type parameter from `visit::Visitor` - Remove `attr::WithAttrs` -- use `attr::HasAttrs` instead. - Change `fold_tt`/`fold_tts` to take token trees by value and avoid wrapping token trees in `Rc`. - Remove the field `ctxt` of `ast::Mac_` - Remove inherent method `attrs()` of types -- use the method `attrs` of `HasAttrs` instead. - #34316: - Remove `ast::Decl`/`ast::DeclKind` and add variants `Local` and `Item` to `StmtKind`. - Move the node id for statements from the `StmtKind` variants to a field of `Stmt` (making `Stmt` a struct instead of an alias for `Spanned<StmtKind>`) - Rename `ast::ExprKind::Again` to `Continue`. - #34339: Generalize and abstract `ThinAttributes` to `ThinVec<Attribute>` - Use `.into()` in convert between `Vec<Attribute>` and `ThinVec<Attribute>` - Use autoderef instead of `.as_attr_slice()` - #34436: Remove the optional expression from `ast::Block` and instead use a `StmtKind::Expr` at the end of the statement list. - #34403: Move errors into a separate crate (unlikely to cause breakage)

bors · 2016-06-28T04:45:10Z

dtolnay · 2016-07-02T20:41:07Z

That top comment is really helpful, thanks @jseyfried.

@nrc

Fix expansion performance regression **syntax-[breaking-change] cc #31645** This fixes #34630 by reverting commit 5bf7970 of PR #33943, which landed in #34424. By removing the `Rc<_>` wrapping around `Delimited` and `SequenceRepetition` in `TokenTree`, 5bf7970 made cloning `TokenTree`s more expensive. While this had no measurable performance impact on the compiler's crates, it caused an order of magnitude performance regression on some macro-heavy code in the wild. I believe this is due to clones of `TokenTree`s in `macro_parser.rs` and/or `macro_rules.rs`. r? @nrc

@nrc

Fix expansion performance regression **syntax-[breaking-change] cc #31645** This fixes #34630 by reverting commit 5bf7970 of PR #33943, which landed in #34424. By removing the `Rc<_>` wrapping around `Delimited` and `SequenceRepetition` in `TokenTree`, 5bf7970 made cloning `TokenTree`s more expensive. While this had no measurable performance impact on the compiler's crates, it caused an order of magnitude performance regression on some macro-heavy code in the wild. I believe this is due to clones of `TokenTree`s in `macro_parser.rs` and/or `macro_rules.rs`. r? @nrc

Joseph Dunne and others added 13 commits June 13, 2016 21:46

Add support for macro expansion inside trait items

dc3d878

Remove inherent method attrs() on AST nodes. attrs() is now a met…

01a0877

…hod of trait `HasAttrs`.

Refactor away field ctxt of ast::Mac_

febe6a4

Change fold_tt and fold_tts to take token trees by value (instead…

5bf7970

… of by reference)

Refactor away WithAttrs trait

683e480

Remove the type parameter from syntax::visit::Visitor

0644aba

Refactor away ast::Decl and refactor ast::Stmt

b5dbe01

Fix fallout

962d5c1

Rename ast::ExprKind::Again -> ast::ExprKind::Continue

f0b21c2

Generalize and abstract ThinAttributes

5033eca

Merge PatKind::QPath into PatKind::Path in AST

f903c97

Refactored tokentrees into their own files in preparation for tokenst…

d59accf

…reams. Modified tests to point to the new file now.

Cleanup comments

f6fe5b6

rust-highfive assigned Manishearth Jun 23, 2016

Jonathan Turner and others added 10 commits June 23, 2016 08:07

Move errors from libsyntax to its own crate

6ae3502

Address comments and fix travis warning

2829fbc

Address more travis errors

51deb4f

Consolidate codemap tests and fix more errors for travis

f2fe204

Fix touchy test to work with old and new error format

bad4869

Actually consolidate the CodeMap tests

b68e079

Move test helper functions to consolidated codemap testing

2b8bab0

Add missing refernce to RenderedLine

d4e79de

Remove field expr of ast::Block

b7da35a

Avoid wasting node ids

a48a4f5

Update src/rustc/Cargo.lock

360dcae

bors merged commit 360dcae into rust-lang:master Jun 28, 2016

mcarton mentioned this pull request Jun 28, 2016

Rustup to ea0dc9297283daff6486807f43e190b4eb561412 rust-lang/rust-clippy#1054

Merged

JayKickliter mentioned this pull request Jul 4, 2016

quickcheck_macros build failing BurntSushi/quickcheck#136

Closed

jseyfried mentioned this pull request Jul 5, 2016

Fix expansion performance regression #34652

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Batch up libsyntax breaking changes #34424

Batch up libsyntax breaking changes #34424

Uh oh!

jseyfried commented Jun 23, 2016 •

edited

Loading

Uh oh!

Manishearth commented Jun 23, 2016

Uh oh!

Manishearth commented Jun 23, 2016

Uh oh!

jseyfried commented Jun 23, 2016 •

edited

Loading

Uh oh!

Manishearth commented Jun 23, 2016 •

edited

Loading

Uh oh!

jseyfried commented Jun 23, 2016 •

edited

Loading

Uh oh!

bors commented Jun 23, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

sophiajt commented Jun 27, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

jseyfried commented Jun 27, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

bors commented Jun 28, 2016

Uh oh!

dtolnay commented Jul 2, 2016

Uh oh!

Uh oh!

Batch up libsyntax breaking changes #34424

Batch up libsyntax breaking changes #34424

Uh oh!

Conversation

jseyfried commented Jun 23, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Manishearth commented Jun 23, 2016

Uh oh!

Manishearth commented Jun 23, 2016

Uh oh!

jseyfried commented Jun 23, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Manishearth commented Jun 23, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jseyfried commented Jun 23, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jun 23, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

sophiajt commented Jun 27, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

jseyfried commented Jun 27, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

bors commented Jun 27, 2016

Uh oh!

bors commented Jun 28, 2016

Uh oh!

dtolnay commented Jul 2, 2016

Uh oh!

Uh oh!

jseyfried commented Jun 23, 2016 •

edited

Loading

jseyfried commented Jun 23, 2016 •

edited

Loading

Manishearth commented Jun 23, 2016 •

edited

Loading

jseyfried commented Jun 23, 2016 •

edited

Loading