Skip to content

Rollup of 7 pull requests - #68752

Merged
bors merged 18 commits into
rust-lang:masterfrom
JohnTitor:rollup-zz3u4xl
Feb 2, 2020
Merged

Rollup of 7 pull requests#68752
bors merged 18 commits into
rust-lang:masterfrom
JohnTitor:rollup-zz3u4xl

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

bobripplingand others added 18 commits January 30, 2020 22:41
This commit adds guidance for when a user means to type a path, but ends
up typing a single colon, such as `<<Impl as T>:Ty>`.
This change seemed pertinent as the current error message is
particularly misleading, emitting `error: unmatched angle bracket`,
despite the angle bracket being matched later on, leaving the user to
track down the typo'd colon.
rustc is now using rustfmt, not the old formatter.
`AllocRef` was reexported as `Alloc` in order to not break toolstate in the week before the next stable release.
…mulacrum
Use BufWriter for emitting MIR
I noticed that `--emit=mir` takes long time on a large crate. rust-lang#64344 seem to have fixed `-Zdump-mir`, but not `--emit=mir`.
…ets, r=Centril
Suggest path separator for single-colon typos
This commit adds guidance for when a user means to type a path, but ends
up typing a single colon, such as `<<Impl as T>:Ty>`.
This change seemed pertinent as the current error message is
particularly misleading, emitting `error: unmatched angle bracket`,
despite the angle bracket being matched later on, leaving the user to
track down the typo'd colon.
…if-on-nightly, r=centril
[docs] remind bug reporters to update nightly
Hi and thanks for rust! Today I reported a bug in nightly that was already fixed, so I thought other potential bug reporters might appreciate a reminder to update before reporting. I wasn't sure if this would apply for other channels as well.
…=Mark-Simulacrum
Ignore `build` dir formatting
I've noticed that rustfmt tries to parse and check the formatting of code in `build` if `.git` is missing (which includes test artifacts and generated code). This should fix that.
…inter-in-format-tests, r=jonas-schievink
Remove a comment about pretty printer in formatting tests
rustc is now using rustfmt, not the old formatter.
Remove `Alloc` in favor of `AllocRef`
`AllocRef` was reexported as `Alloc` in rust-lang#68529 in order to not break toolstate in the week before the next stable release.
r? @Amanieu
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=7 rollup=never

@bors

bors commented Feb 1, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 87bb0c4 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 1, 2020
@JohnTitorJohnTitor added the rollup A PR which is a rollup label Feb 1, 2020
@bors

bors commented Feb 1, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 87bb0c4 with merge e5b150e...

bors added a commit that referenced this pull request Feb 1, 2020
Rollup of 7 pull requests
Successful merges:
- #68460 (Use BufWriter for emitting MIR)
- #68681 (Suggest path separator for single-colon typos)
- #68688 ([docs] remind bug reporters to update nightly)
- #68704 (Ignore `build` dir formatting)
- #68727 (Remove a comment about pretty printer in formatting tests)
- #68736 (Remove `Alloc` in favor of `AllocRef`)
- #68740 (Do not suggest things named underscore)
Failed merges:
r? @ghost
@bors

bors commented Feb 2, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 2, 2020
@bors
bors merged commit 87bb0c4 into rust-lang:masterFeb 2, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #68752!

Tested on commit e5b150e.
Direct link to PR: #68752

💔 miri on windows: test-pass → test-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
💔 miri on linux: test-pass → test-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
💔 nomicon on windows: test-pass → test-fail (cc @Gankra@frewsxcv, @rust-lang/infra).
💔 nomicon on linux: test-pass → test-fail (cc @Gankra@frewsxcv, @rust-lang/infra).
💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor@amanjeev@spastorino@mark-i-m, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Feb 2, 2020
Tested on commit rust-lang/rust@e5b150e.
Direct link to PR: <rust-lang/rust#68752>
💔 miri on windows: test-pass → test-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
💔 miri on linux: test-pass → test-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
💔 nomicon on windows: test-pass → test-fail (cc @Gankra@frewsxcv, @rust-lang/infra).
💔 nomicon on linux: test-pass → test-fail (cc @Gankra@frewsxcv, @rust-lang/infra).
💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor@amanjeev@spastorino@mark-i-m, @rust-lang/infra).
@JohnTitor
JohnTitor deleted the rollup-zz3u4xl branch February 2, 2020 04:21
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

9 participants

@JohnTitor@bors@rust-highfive@bobrippling@jbr@jonas-schievink@sinkuu@sugar700@TimDiekmann