Skip to content

Rollup of 16 pull requests - #55012

Merged
bors merged 37 commits into
rust-lang:masterfrom
kennytm:rollup
Oct 12, 2018
Merged

Rollup of 16 pull requests#55012
bors merged 37 commits into
rust-lang:masterfrom
kennytm:rollup

Conversation

@kennytm

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

lucasloispand others added 30 commits October 2, 2018 13:31
Clarification of the use of `ptr::eq` to test equality of references
via address by pointer coercion
Previously, move errors involving the dereference of a raw pointer would
say "borrowed content". This commit changes it to say "dereference of
raw pointer".
and to briefly touch on the theory of debugging rustc versus the
practice of such.
We originally didn't have threads, and now we're starting to add them!
Make sure we properly synchronize access to dlmalloc when the `atomics`
feature is enabled for `wasm32-unknown-unknown`.
There was an issue (rust-lang#33025) which caused these tests to not work. The issue has
since been fixed in rust-lang#33133, and so we can now include them.
…ss-eq, r=QuietMisdreavus
Documents reference equality by address (rust-lang#54197)
Clarification of the use of `ptr::eq` to test equality of references via address by pointer coercion, regarding issue rust-lang#54197 .
The same example as in `ptr::eq` docs is shown here to clarify that
`PartialEq` compares values pointed-to instead of via address (which can be desired in some cases)
…trap-default-for-optimize-from-debug-setting, r=nikomatsakis
During rustc bootstrap, make default for `optimize` independent of `debug`
It may have taken me three and a half years, but I'm following through on my ["threat"](rust-lang#24840 (comment))
Fixrust-lang#24840
…nter, r=pnkfelix
NLL says "borrowed content" instead of more precise "dereference of raw pointer"
Part of rust-lang#52663.
Previously, move errors involving the dereference of a raw pointer would
say "borrowed content". This commit changes it to say "dereference of
raw pointer".
r? @nikomatsakis
cc @pnkfelix
Add doc comments about safest way to initialize a vector of zeros
This adds more information about the vec! macro as discussed in rust-lang#54628. I think this is a good starting point, but I think additional detail is needed so that we can explain why vec! is safer than the alternatives.
Fix tracking issue for Once::is_completed
rust-lang#53027 was merged without a tracking issue. I just filed rust-lang#54890. CC @matklad
doc fix: it's auto traits that make for automatic implementations
Being a marker trait is not good enough (that just means "no items in the trait").
r? @alexcrichton who [originally wrote these docs](RalfJung@0a13f1a).
Fix handling of #[must_use] on unit and uninhabited types
Fixesrust-lang#54828.
…ents, r=alexcrichton
A handful of random string-related improvements
- remove a few allocations in `errors/diagnostic`
- make `build_helper::gnu_target` return `Cow<str>`
impl Eq+Hash for TyLayout
As proposed by @eddyb at rust-lang#53671 (review).
I have an upcoming PR that would also significantly benefit from this.
…=sfackler
std: Synchronize global allocator on wasm32
We originally didn't have threads, and now we're starting to add them!
Make sure we properly synchronize access to dlmalloc when the `atomics`
feature is enabled for `wasm32-unknown-unknown`.
"(using ..." doesn't have the matching ")"
Fixesrust-lang#54948.
add a macro for static (compile-time) assertions
Cc @oli-obk
Remove incorrect span for second label inner macro invocation
A fix for issue rust-lang#54841
…mandry
Fix spelling in the documentation to htmldocck.py
I was reading through htmldocck.py, and decided to attempt to clean it up a little bit. Let me know if you disagree with my edits.
@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=16

@bors

bors commented Oct 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit d64c77a has been approved by kennytm

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 12, 2018
@bors

bors commented Oct 12, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d64c77a with merge 945372d...

bors added a commit that referenced this pull request Oct 12, 2018
Rollup of 16 pull requests
Successful merges:
- #54755 (Documents reference equality by address (#54197))
- #54811 (During rustc bootstrap, make default for `optimize` independent of `debug`)
- #54825 (NLL says "borrowed content" instead of more precise "dereference of raw pointer")
- #54860 (Add doc comments about safest way to initialize a vector of zeros)
- #54869 (Fix mobile docs)
- #54891 (Fix tracking issue for Once::is_completed)
- #54913 (doc fix: it's auto traits that make for automatic implementations)
- #54920 (Fix handling of #[must_use] on unit and uninhabited types)
- #54932 (A handful of random string-related improvements)
- #54936 (impl Eq+Hash for TyLayout)
- #54950 (std: Synchronize global allocator on wasm32)
- #54956 ("(using ..." doesn't have the matching ")")
- #54958 (add a macro for static (compile-time) assertions)
- #54967 (Remove incorrect span for second label inner macro invocation)
- #54983 (Fix slice's benchmarks)
- #54989 (Fix spelling in the documentation to htmldocck.py)
Failed merges:
r? @ghost
@bors

bors commented Oct 12, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 945372d to master...

@bors
bors merged commit d64c77a into rust-lang:masterOct 12, 2018
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

16 participants

@kennytm@bors@Centril@lucasloisp@pnkfelix@mandeep@SimonSapin@davidtwco@RalfJung@varkor@alexcrichton@kzys@ljedrz@holmgr@Munksgaard@GuillaumeGomez