Skip to content

Rollup of 6 pull requests #51310

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 18 commits into from
Jun 3, 2018
Merged

Rollup of 6 pull requests #51310

merged 18 commits into from
Jun 3, 2018

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

fintelia and others added 18 commits April 22, 2018 15:39
This avoids a full compiler build in order to build and/or run tests for
rustdoc.
 Add as_nanos function to Duration

Duration has historically lacked a way to get the actual number of nanoseconds it contained as a normal Rust type because u64 was of insufficient range, and f64 of insufficient precision. The u128 type solves both issues, so I propose adding an `as_nanos` function to expose the capability.
…labnik

Provide more context for what the {f32,f64}::EPSILON values represent.

Introduce the 'machine epsilon' term because if one googles 'epsilon', they might stumble upon https://en.wikipedia.org/wiki/Epsilon_numbers_(mathematics) instead of https://en.wikipedia.org/wiki/Machine_epsilon
Fix typos of ‘ambiguous’

I had trouble finding this code because of the typo after it was [referenced in a tweet](https://twitter.com/bstrie/status/1002751044605153280). Also fixes an identical but unrelated typo in a comment.
…etMisdreavus

Permit building rustdoc without compiler artifacts

None
@rust-highfive
Copy link
Contributor

r? @KodrAus

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

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

r? @Mark-Simulacrum

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Jun 2, 2018

📌 Commit dcfe311 has been approved by Mark-Simulacrum

@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 2, 2018
@bors
Copy link
Collaborator

bors commented Jun 2, 2018

⌛ Testing commit dcfe311 with merge 3515dab...

bors added a commit that referenced this pull request Jun 2, 2018
Rollup of 6 pull requests

Successful merges:

 - #50167 ( Add as_nanos function to Duration)
 - #50919 (Provide more context for what the {f32,f64}::EPSILON values represent.)
 - #51124 (Reword {ptr,mem}::replace docs.)
 - #51147 (Stabilize SliceIndex trait.)
 - #51291 (Fix typos of ‘ambiguous’)
 - #51302 (Permit building rustdoc without compiler artifacts)

Failed merges:
@bors
Copy link
Collaborator

bors commented Jun 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 3515dab to master...

@bors bors merged commit dcfe311 into rust-lang:master Jun 3, 2018
@bors bors mentioned this pull request Jun 3, 2018
4 tasks
@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 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.

9 participants