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 5 pull requests #64057

Merged
merged 14 commits into from
Sep 1, 2019
Merged

Rollup of 5 pull requests #64057

merged 14 commits into from
Sep 1, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 1, 2019

Successful merges:

Failed merges:

r? @ghost

andjo403 and others added 14 commits August 30, 2019 21:26
as the test is small we do not want split up in multiple codegen units
and also as there is multiple test running at the same time this
will reduce the number of concurrent threads
Properly account for left margin when setting terminal width through
CLI flag and don't trim code by default if we can't get the terminal's
dimensions.
Fixes a few repetitions of "like like" in the `trim*` methods documentation of `str`.
Update BufWriter example to include call to flush()

I was playing with a writing a Huffman encoder/decoder and was getting weird corruptions and truncations.  I finally realized it was was because `BufWriter` was swallowing write errors 😬.  I've found Rust to generally be explicit and err on the safe side, so I definitely found this unintuitive and not "rustic".

https://twitter.com/johnterickson/status/1159514988123312128
Account for rounding errors when deciding the diagnostic boundaries

Fix Miri by fixing the bug raised in rust-lang#63402 (comment).

Fixes rust-lang#64020
…lacrum

rustdoc use -Ccodegen-units=1 by default for test compile

as the test is small we do not want split up in multiple codegen units
and also as there is multiple test running at the same time this
will reduce the number of concurrent threads

tested the test time with `./x.py test src/libcore --doc`
for my 16 core 32 thread cpu i get about 6% faster execution
and my 2 core 4 thread cpu I get about 10% faster execution

cc rust-lang#63638
 r? @Mark-Simulacrum
…schievink

Fix word repetition in str documentation

Fixes a few repetitions of "like like" in the `trim*` methods documentation of `str`.
@Centril
Copy link
Contributor Author

Centril commented Sep 1, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Sep 1, 2019

📌 Commit 0211246 has been approved by Centril

@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 Sep 1, 2019
@bors
Copy link
Contributor

bors commented Sep 1, 2019

⌛ Testing commit 0211246 with merge e29faf0...

bors added a commit that referenced this pull request Sep 1, 2019
Rollup of 5 pull requests

Successful merges:

 - #63410 (Update BufWriter example to include call to flush())
 - #64029 (Account for rounding errors when deciding the diagnostic boundaries)
 - #64032 (rustdoc use -Ccodegen-units=1 by default for test compile)
 - #64039 (Update sync condvar doc style)
 - #64042 (Fix word repetition in str documentation)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 1, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing e29faf0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 1, 2019
@bors bors merged commit 0211246 into rust-lang:master Sep 1, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #64057!

Tested on commit e29faf0.
Direct link to PR: #64057

🎉 miri on windows: test-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: test-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 1, 2019
Tested on commit rust-lang/rust@e29faf0.
Direct link to PR: <rust-lang/rust#64057>

🎉 miri on windows: test-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: test-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@Centril Centril deleted the rollup-nwtk2fb branch September 1, 2019 15:30
@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
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.

8 participants