Skip to content

Rollup of 8 pull requests - #68174

Merged
bors merged 18 commits into
rust-lang:masterfrom
JohnTitor:rollup-ix4amrj
Jan 13, 2020
Merged

Rollup of 8 pull requests#68174
bors merged 18 commits into
rust-lang:masterfrom
JohnTitor:rollup-ix4amrj

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

oli-obkand others added 18 commits December 15, 2019 09:42
The link for UNIX was pointing to the Cloud ABI docs. It should have
been pointing to the clock_gettime docs instead. The table is repeated
in the docs for SystemTime, but there the UNIX entry was already correct.
…s̶dataflow, r=ecstatic-morse
Document more use cases of dataflow
r? @ecstatic-morse
Specify units for test timeout environment variables
I think it is not obvious (I got it from reading libtest sources), so it is worth mentioning in docs.
…ities, r=Centril
restore some rustc_parse visibilities for rustfmt
In rust-lang@c189565 some visibilities were reduced on the parse mod (which now resides in the rustc_parse crate) as part of some refactoring and splitting up of libsyntax. However, rustfmt needs access to a few of those items that are no longer visible.
This restores the visibility on those items rustfmt depends on.
rust-lang/rustfmt#3903 (comment)rust-lang/rustfmt#4009
cc @topecongiro
…t, r=Centril
Expose `context::CheckLintNameResult`
Clippy needs it
r? @Centril
Fix system call docs for time::Instant
The link for UNIX was pointing to the Cloud ABI docs. It should have been pointing to the `clock_gettime` docs instead. A similar table is repeated in the docs for `SystemTime`, but there the UNIX entry was already correct.
`clock_gettime(CLOCK_MONOTONIC)` is the current implementation: https://github.com/rust-lang/rust/blob/3ebcfa1451cfedc13a07e6353d8ade9742dfdc2a/src/libstd/sys/unix/time.rs#L274https://github.com/rust-lang/rust/blob/3ebcfa1451cfedc13a07e6353d8ade9742dfdc2a/src/libstd/sys/unix/time.rs#L348-L352
r? @steveklabnik
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=8 rollup=never

@bors

bors commented Jan 13, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 87bdc8e 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 Jan 13, 2020
@JohnTitorJohnTitor added the rollup A PR which is a rollup label Jan 13, 2020
@bors

bors commented Jan 13, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 87bdc8e with merge af95804...

bors added a commit that referenced this pull request Jan 13, 2020
Rollup of 8 pull requests
Successful merges:
- #67313 (Document more use cases of dataflow)
- #67959 (rustdoc: improve stability mark arrows)
- #68097 (Specify units for test timeout environment variables)
- #68135 (restore some rustc_parse visibilities for rustfmt)
- #68145 (Expose `context::CheckLintNameResult`)
- #68156 (Fix crate paths in comments)
- #68157 (Clean up E0186 explanation)
- #68161 (Fix system call docs for time::Instant)
Failed merges:
r? @ghost
@bors

bors commented Jan 13, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 13, 2020
@bors
bors merged commit 87bdc8e into rust-lang:masterJan 13, 2020
@JohnTitor
JohnTitor deleted the rollup-ix4amrj branch January 13, 2020 11:40
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.

8 participants

@JohnTitor@bors@oli-obk@liigo@MikailBag@calebcartwright@GuillaumeGomez@ruuda