Skip to content
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

Rollup of 9 pull requests #51426

Merged
merged 19 commits into from
Jun 8, 2018
Merged

Rollup of 9 pull requests #51426

merged 19 commits into from
Jun 8, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Jun 7, 2018

Successful merges:

Failed merges:

kennytm and others added 19 commits June 2, 2018 05:11
…are now exactly the same as that produced by AST borrowck. Bravo!
It has no effect on deployment error and may cause further network issues.
…derr-files, r=oli-obk

Remove two redundant .nll.stderr files

It turns out that the diagnostics generated from NLL for these cases are now exactly the same as that produced by AST borrowck, and thus we can just fallback on those `.stderr` files that already exist for AST-borrowck.

Bravo!

(it is a good idea to remove these files, because it slightly reduces the amount of time humans will spend reviewing the .nll.stderr fileset...)

((it *might* be worthwhile trying to change the `compiletest` code to even issue a warning when two such files have equivalent contents... but I am not going so far as to try to implement that right now...))
…ng-song-and-dance, r=nikomatsakis

Deny #[cfg] and #[cfg_attr] on generic parameters.

Fix rust-lang#51279.

Attributes on generic parameters are not expanded, meaning `#[cfg]`, `#[cfg_attr]` and attribute proc macros are entirely ignored on them.

This PR makes using the first two attributes an error, because if they are correctly expanded will affect the AST and change code behavior.

I'm beta-nominating this, because generic parameter attributes are stabilizing in 1.27, and if we did not reserve their usage, we may never be able to repurpose the meaning of these attributes in the Rust 2015 edition.
…s, r=eddyb

Fix the use of closures within #[panic_implementation]

Fixes rust-lang#51365.
…r=oli-obk

Remove dependency on fmt_macros from typeck

None
…b, r=QuietMisdreavus

rustdoc: Fix missing stability and src links for inlined external macros

Fixes rust-lang#38951

r? @QuietMisdreavus
NLL performance boost

This makes compilation of the [inflate](https://github.com/rust-lang-nursery/rustc-perf/tree/master/collector/benchmarks/inflate) benchmark compile 2 times faster on my computer when NLL is enabled.
This does not fix the rust-lang#51377 perfectly, it's still 4-5 times slower than without NLL, but it's a start.
…tsakis

Revert rust-lang#49719

This also needs to be backported into beta.

Fixes rust-lang#51416.
r? @nikomatsakis
…-Simulacrum

Tries to address the recent network issues

1. Set the DNS server to 8.8.8.8/8.8.4.4/1.1.1.1/1.0.0.1 to workaround the daily "Cannot resolve host" error these two weeks.
2. Remove the unnecessary command `gem update --system` (originally added as experiment of the "Could not find a valid gem" error, which turns out to be useless).
@rust-highfive
Copy link
Collaborator

r? @pnkfelix

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

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 7, 2018
@kennytm
Copy link
Member Author

kennytm commented Jun 7, 2018

@bors r+ p=30

@bors
Copy link
Contributor

bors commented Jun 7, 2018

📌 Commit 34cd36e has been approved by kennytm

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 7, 2018
@bors
Copy link
Contributor

bors commented Jun 7, 2018

⌛ Testing commit 34cd36e with merge 1b4c921...

bors added a commit that referenced this pull request Jun 7, 2018
Rollup of 9 pull requests

Successful merges:

 - #51186 (Remove two redundant .nll.stderr files)
 - #51283 (Deny #[cfg] and #[cfg_attr] on generic parameters.)
 - #51368 (Fix the use of closures within #[panic_implementation])
 - #51380 (Remove dependency on fmt_macros from typeck)
 - #51389 (rustdoc: Fix missing stability and src links for inlined external macros)
 - #51399 (NLL performance boost)
 - #51407 (Update RLS and Rustfmt)
 - #51417 (Revert #49719)
 - #51420 (Tries to address the recent network issues)

Failed merges:
@kennytm
Copy link
Member Author

kennytm commented Jun 8, 2018

@bors treeclosed=30

@bors
Copy link
Contributor

bors commented Jun 8, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 1b4c921 to master...

@bors bors merged commit 34cd36e into rust-lang:master Jun 8, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #51426!

Tested on commit 1b4c921.
Direct link to PR: #51426

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 8, 2018
Tested on commit rust-lang/rust@1b4c921.
Direct link to PR: <rust-lang/rust#51426>

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.