Rollup of 11 pull requests by Manishearth · Pull Request #34552 · rust-lang/rust

Manishearth · 2016-06-29T15:51:24Z

Successful merges: Give ast::ExprKind::Paren no-op expressions the same ids as their children. #34355, Treat MultiDecorators as a special case of MultiModifiers #34446, Miscellaneous macro expansion cleanup and groundwork #34459, Add regression test for #33455 #34460, Add new error codes and improve some explanations #34467, Forbid type parameters and global paths in macro invocations #34495, Revert "skip double negation in const eval" #34497, Disable debuginfo tests for a given blacklist of LLDB versions #34499, rustdoc: Fix a few stripping issues #34513, rustdoc: Fix empty Implementations section on some module pages #34536, Fix non-termination on recursive module re-exports in extern crates #34542
Failed merges:

This reverts commit 735c018.

We need to recurse into stripped modules to strip things like impl methods but when doing so we must not add any items to the `retained` set.

… on the statement

…ssify ident patterns

These are caused by `DefaultImpl`s.

…eir children.

@nrc

…nique, r=nrc Give `ast::ExprKind::Paren` no-op expressions the same ids as their children. Having `ast::ExprKind::Paren` expressions share ids with their children - reduces the number of unused `NodeId`s in the hir map and - guarantees that `tcx.map.expect_expr(ast_expr.id)` is the hir corresponding to `ast_expr`. This fixes the bug from rust-lang#34327, which was introduced in rust-lang#33296 when I assumed the above guarantee. r? @nrc

@durka

Treat `MultiDecorator`s as a special case of `MultiModifier`s This deals with rust-lang#32950 by using @durka's [option 1](rust-lang#33769 (comment)). r? @nrc

@nrc

Miscellaneous macro expansion cleanup and groundwork r? @nrc

Add regression test for rust-lang#33455Closesrust-lang#33455.

@brson

Add new error codes and improve some explanations r? @brson cc @steveklabnik cc @jonathandturner

@eddyb

…ons, r=eddyb Forbid type parameters and global paths in macro invocations Fixesrust-lang#28558. This is a [breaking-change]. For example, the following would break: ```rust macro_rules! m { () => { () } } fn main() { m::<T>!(); // Type parameters are no longer allowed in macro invocations ::m!(); // Global paths are no longer allowed in macro invocations } ``` Any breakage can be fixed by removing the type parameters or the leading `::` (respectively). r? @eddyb

@eddyb

Revert "skip double negation in const eval" This reverts commit 735c018. fixesrust-lang#34395 The original commit was based on a mis-understanding of the overflowing literal lint. This needs to be ported to beta. r? @eddyb

@tedhorst

…alexcrichton Disable debuginfo tests for a given blacklist of LLDB versions Anyone having trouble with most LLDB tests failing on OSX, please report your LLDB version here so I can add it to the blacklist. Blacklisted versions so far: * lldb-350.* cc @rust-lang/tools cc @tedhorst @indutny @jonathandturner (people from the original bug report) Fixesrust-lang#32520.

…chton rustdoc: Fix a few stripping issues We need to recurse into stripped modules to strip things like impl methods but when doing so we must not add any items to the `retained` set. For example this removes [`core::num::ParseFloatError::__description`](https://doc.rust-lang.org/nightly/core/num/struct.ParseFloatError.html#method.__description) and [`impl Clone for ThreadRng`](https://doc.rust-lang.org/nightly/std/clone/trait.Clone.html).

…xcrichton rustdoc: Fix empty Implementations section on some module pages These are caused by `DefaultImpl`s. For example [`core::marker`](https://doc.rust-lang.org/nightly/core/marker/#impls).

@nrc

Fix non-termination on recursive module re-exports in extern crates Fixesrust-lang#33776. r? @nrc

rust-highfive · 2016-06-29T15:51:30Z

r? @arielb1

(rust_highfive has picked a reviewer for you, use r? to override)

Manishearth · 2016-06-29T15:53:49Z

@bors r+ p=10

bors · 2016-06-29T15:53:50Z

📌 Commit 8e2598c has been approved by Manishearth

bors · 2016-06-29T16:09:02Z

⌛ Testing commit 8e2598c with merge 38ac6cc...

bors · 2016-06-29T17:59:14Z

💔 Test failed - auto-linux-64-x-android-t

alexcrichton · 2016-06-29T18:04:17Z

@bors: retry force clean

Spurious timeouts compiling librustc on the Android bot #34559

On Wed, Jun 29, 2016 at 10:59 AM, bors notifications@github.com wrote:

💔 Test failed - auto-linux-64-x-android-t
http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/9597
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#34552 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AAD95FmI8LyQ1JKXU9tAQy5dgVamYmHKks5qQrJ1gaJpZM4JBSRB
.

alexcrichton · 2016-06-29T20:16:46Z

@bors: retry force clean

bors · 2016-06-29T20:17:03Z

⌛ Testing commit 8e2598c with merge c6cb5e4...

bors · 2016-06-29T20:31:24Z

💔 Test failed - auto-linux-cross-opt

alexcrichton · 2016-06-29T20:48:18Z

@bors: retry

buildbot is weird

On Wed, Jun 29, 2016 at 1:31 PM, bors notifications@github.com wrote:

💔 Test failed - auto-linux-cross-opt
https://buildbot.rust-lang.org/builders/auto-linux-cross-opt/builds/2798
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#34552 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AAD95MxIkH2GuNvDeziJ2Qx8sAmGrh7Nks5qQtYfgaJpZM4JBSRB
.

bors · 2016-06-29T22:43:36Z

⌛ Testing commit 8e2598c with merge bd5c805...

bors · 2016-06-29T23:02:33Z

💔 Test failed - auto-linux-64-x-android-t

alexcrichton · 2016-06-29T23:03:39Z

@bors: retry

I killed that build, it was building an unoptimized LLVM... again...

bors · 2016-06-30T01:44:27Z

⌛ Testing commit 8e2598c with merge c2b56fb...

Rollup of 11 pull requests - Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542 - Failed merges:

bors · 2016-06-30T04:42:10Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

dsprenkelsand others added 30 commits June 25, 2016 00:11

add regression test forrust-lang#33455
7ffd46c

Add new error codes and improve some explanations
58955de

Forbid type parameters and global paths in macro invocations
e01a2ba

Add regression test
b4611b1

Revert "skip double negation in const eval"
b8f9c88
This reverts commit 735c018.

Disable debuginfo tests for a given blacklist of LLDB versions
f41de0f

rustdoc: Fix a few stripping issues
beebaf1
We need to recurse into stripped modules to strip things like impl methods but when doing so we must not add any items to the `retained` set.

cleanup: don't count attributes on an item in a statement position as…
b968ee3
… on the statement

cleanup: use DummyResult to implement MacroGenerable::dummy
2dc15f2

groundwork: use resolve_identifier instead of resolve_path to cla…
4a13bcb
…ssify ident patterns

cleanup: refactor away ast::NodeIdAssigner
36a4eb9

groundwork: refactor the interface that resolve exposes to driver
ec0c150

groundwork: create the Resolver earlier in phase 2
e58963d

rustdoc: Fix empty Implementations section on some module pages
f05da01
These are caused by `DefaultImpl`s.

Fix infinite loop on recursive module exports in an extern crate
232783c

Add regression test
9ffe1c9

Disallow derive on items with type macros
66ef652

Treat MultiDecorators as a special case of MultiModifiers
a595ffa

Refactor away parser.commit_stmt_expecting()
a9d25f8

Give ast::ExprKind::Paren no-op expressions the same node ids as th…
8557a2e
…eir children.

Rollup merge ofrust-lang#34446- jseyfried:refactor_decorators, r=nrc
470c519
Treat `MultiDecorator`s as a special case of `MultiModifier`s This deals with rust-lang#32950 by using @durka's [option 1](rust-lang#33769 (comment)). r? @nrc

Rollup merge ofrust-lang#34459- jseyfried:expansion_cleanup, r=nrc
fd45e6e
Miscellaneous macro expansion cleanup and groundwork r? @nrc

Rollup merge ofrust-lang#34460- dsprenkels:issue-33455, r=alexcrichton
d11ac23
Add regression test for rust-lang#33455Closesrust-lang#33455.

Rollup merge ofrust-lang#34467- GuillaumeGomez:err-codes, r=brson
2a0c2c3
Add new error codes and improve some explanations r? @brson cc @steveklabnik cc @jonathandturner

Rollup merge ofrust-lang#34536- ollie27:rustdoc_module_impls, r=ale…
cc15c21
…xcrichton rustdoc: Fix empty Implementations section on some module pages These are caused by `DefaultImpl`s. For example [`core::marker`](https://doc.rust-lang.org/nightly/core/marker/#impls).

Rollup merge ofrust-lang#34542- jseyfried:fix_recursive_modules, r=nrc
8e2598c
Fix non-termination on recursive module re-exports in extern crates Fixesrust-lang#33776. r? @nrc

rust-highfive assigned arielb1 Jun 29, 2016

bors added a commit that referenced this pull request Jun 30, 2016
Auto merge of#34552- Manishearth:rollup, r=Manishearth
c2b56fb
Rollup of 11 pull requests - Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542 - Failed merges:

bors merged commit 8e2598c into rust-lang:masterJun 30, 2016

This was referenced Jun 30, 2016
Some more pattern cleanup and bugfixing #34365
Merged
WIP: infrastructure for testing save-analysis #34522
Closed

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Uh oh!

Uh oh!

Conversation

Manishearth commented Jun 29, 2016

Uh oh!

rust-highfive commented Jun 29, 2016

Uh oh!

Manishearth commented Jun 29, 2016

Uh oh!

bors commented Jun 29, 2016

Uh oh!

bors commented Jun 29, 2016

Uh oh!

bors commented Jun 29, 2016

Uh oh!

alexcrichton commented Jun 29, 2016

Uh oh!

alexcrichton commented Jun 29, 2016

Uh oh!

bors commented Jun 29, 2016

Uh oh!

bors commented Jun 29, 2016

Uh oh!

alexcrichton commented Jun 29, 2016

Uh oh!

bors commented Jun 29, 2016

Uh oh!

bors commented Jun 29, 2016

Uh oh!

alexcrichton commented Jun 29, 2016

Uh oh!

bors commented Jun 30, 2016

Uh oh!

bors commented Jun 30, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants