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 10 pull requests #67721

Merged
merged 29 commits into from
Dec 30, 2019
Merged

Rollup of 10 pull requests #67721

merged 29 commits into from
Dec 30, 2019

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrum and others added 29 commits December 23, 2019 11:56
Stabilize attribute macros on inline modules

While still gating non-inline modules in proc macro input.

Split from rust-lang#63931
cc rust-lang#54727
…, r=estebank

typeck: note other end-point when checking range pats

Fixes rust-lang#57389, alternative to rust-lang#67214 that should be less invasive to type checking logic.

r? @estebank
… r=LukasKalbertodt

docs: Iterator adapters have unspecified results after a panic

Fixes rust-lang#58170.

That issue also has rough consensus from 3 members of the library team for this being the behavior we would like to specify.
Some keyword documentation.

I thought about going into detail, but I'd much rather route them to the async book asap.
Clean up const-hack PRs now that const if / match exist.

Closes rust-lang#67627.

Cleans up these merged PRs tagged with `const-hack`:

- rust-lang#63810
- rust-lang#63786
- rust-lang#61635
- rust-lang#58044

reverting their contents to have the match or if expressions they originally contained.

r? @oli-obk

There's one more PR in those tagged with `const-hack` that originally wasn't merged (rust-lang#65107). Reading the thread, it looks like it was originally closed because the `const-hack` for the checked arithmetic non-negligibly hurt performance, and because there was no way to manipulate the returned Option at compile time anyway (with neither const if nor const match). Would you like me to add these changes to the changes from this PR here too, now that we have the necessary features?
resolve: Minor cleanup of duplicate macro reexports

Enabled by rust-lang#65785 which changed `duplicate_macro_exports` from a lint to a hard error.
Do not ICE on lifetime error involving closures

Fix rust-lang#67634.
Move reachable_set and diagnostic_items to librustc_passes.

Split out of rust-lang#67688

r? @Zoxc
…lacrum

tidy: Enforce formatting rather than just check it if `--bless` is specified

Ensuring the "tidy"-ness currently requires running `rustfmt` twice:
```sh
./x.py fmt && ./x.py test tidy
```
, once to actually format code and the second time as a part of tidy to check that the code is formatted.

Running `rustfmt` is slow, so we don't want to run it twice.

With this PR tidy enforces the formatting rather than just checks it if `--bless` was passed to it:
```sh
./x.py test tidy --bless
```

r? @Mark-Simulacrum
@JohnTitor
Copy link
Member Author

@bors r+ p=10 rollup=never

@bors
Copy link
Contributor

bors commented Dec 30, 2019

📌 Commit dcc30ac has been approved by JohnTitor

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 30, 2019
@JohnTitor JohnTitor added the rollup A PR which is a rollup label Dec 30, 2019
@bors
Copy link
Contributor

bors commented Dec 30, 2019

⌛ Testing commit dcc30ac with merge d297b19...

bors added a commit that referenced this pull request Dec 30, 2019
Rollup of 10 pull requests

Successful merges:

 - #64273 (Stabilize attribute macros on inline modules)
 - #67287 (typeck: note other end-point when checking range pats)
 - #67564 (docs: Iterator adapters have unspecified results after a panic)
 - #67622 (Some keyword documentation.)
 - #67657 (Clean up const-hack PRs now that const if / match exist.)
 - #67677 (resolve: Minor cleanup of duplicate macro reexports)
 - #67687 (Do not ICE on lifetime error involving closures)
 - #67698 (Move reachable_set and diagnostic_items to librustc_passes.)
 - #67701 (tidy: Enforce formatting rather than just check it if `--bless` is specified)
 - #67715 (Typo fix)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 30, 2019

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing d297b19 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 30, 2019
@bors bors merged commit dcc30ac into rust-lang:master Dec 30, 2019
@JohnTitor JohnTitor deleted the rollup-o8zm4r9 branch December 30, 2019 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

10 participants