Skip to content

Rollup of 11 pull requests #34552

New issue

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

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

Already on GitHub? # to your account

Merged
merged 31 commits into from
Jun 30, 2016
Merged

Rollup of 11 pull requests #34552

merged 31 commits into from
Jun 30, 2016

Conversation

dsprenkels and others added 30 commits June 25, 2016 00:11
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.
…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
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
Miscellaneous macro expansion cleanup and groundwork

r? @nrc
…ons, r=eddyb

Forbid type parameters and global paths in macro invocations

Fixes rust-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
Revert "skip double negation in const eval"

This reverts commit 735c018.

fixes rust-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
…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)

Fixes rust-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).
Fix non-termination on recursive module re-exports in extern crates

Fixes rust-lang#33776.
r? @nrc
@rust-highfive
Copy link
Contributor

r? @arielb1

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

@Manishearth
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Jun 29, 2016

📌 Commit 8e2598c has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Jun 29, 2016

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

@bors
Copy link
Collaborator

bors commented Jun 29, 2016

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

@alexcrichton
Copy link
Member

@bors: retry force clean

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
Copy link
Member

@bors: retry force clean

@bors
Copy link
Collaborator

bors commented Jun 29, 2016

⌛ Testing commit 8e2598c with merge c6cb5e4...

@bors
Copy link
Collaborator

bors commented Jun 29, 2016

💔 Test failed - auto-linux-cross-opt

@alexcrichton
Copy link
Member

@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
Copy link
Collaborator

bors commented Jun 29, 2016

⌛ Testing commit 8e2598c with merge bd5c805...

@bors
Copy link
Collaborator

bors commented Jun 29, 2016

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

@alexcrichton
Copy link
Member

@bors: retry

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

@bors
Copy link
Collaborator

bors commented Jun 30, 2016

⌛ Testing commit 8e2598c with merge c2b56fb...

bors added a commit that referenced this pull request Jun 30, 2016
Rollup of 11 pull requests

- Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542
- Failed merges:
@bors bors merged commit 8e2598c into rust-lang:master Jun 30, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.