Skip to content

Rollup of 11 pull requests - #35808

Closed
steveklabnik wants to merge 22 commits into
rust-lang:masterfrom
steveklabnik:rollup
Closed

Rollup of 11 pull requests#35808
steveklabnik wants to merge 22 commits into
rust-lang:masterfrom
steveklabnik:rollup

Conversation

matthew-piziakand others added 22 commits August 17, 2016 20:37
Currently most of the operator traits use trivial implementation
examples that only perform side effects. Honestly, that might not be too
bad for the sake of documentation; but anyway, here's a proposal to move
a slightly modified version of the module-level point-addition example
into the `Add` documentation, since it's more evocative of addition
semantics.
Part of rust-lang#29365
wrap identifiers in backticks
minor rephrasing
fix module-level documentation to be more truthful
This branch changes the example for `Add` to no longer be a "minimum implementation that prints something to the screen".
Changed datastructure to data structure
* `std::ffi::OsStr::new`.
* `std::ffi::OsStr::is_empty`.
* `std::ffi::OsStr::len`.
Part of rust-lang#29365
explain that std::mem::drop in prelude will invoke Drop
change "prelude" -> "the prelude"; change links to reference-style
move link references to links' section
…=GuillaumeGomez
replace `Add` example with something more evocative of addition
Currently most of the operator traits use trivial implementation
examples that only perform side effects. Honestly, that might not be too
bad for the sake of documentation; but anyway, here's a proposal to move
a slightly modified version of the module-level point-addition example
into the `Add` documentation, since it's more evocative of addition
semantics.
Part of rust-lang#29365
…veklabnik
note that calling drop() explicitly is a compiler error
Part of rust-lang#29365
…llaumeGomez
Add a few doc examples for `std::ffi::OsStr`.
… r=jonathandturner
updated E0395 to new error format
Updated E0395 to new error format.
Part of rust-lang#35233Fixesrust-lang#35693
Thanks again for letting me help!
r? @jonathandturner
…=jonathandturner
updated E0396 to new error format
Updated E0396 to new error format.
Part of rust-lang#35233Fixesrust-lang#35779
Thanks again for letting me help!
r? @jonathandturner
Very minor spelling fix in the book
Changed datastructure to data structure.
r? @steveklabnik
…teveklabnik
demonstrate `RHS != Self` use cases for `Add` and `Sub`
…=steveklabnik
replace `AddAssign` example with something more evocative of addition
This is analogous to PR rust-lang#35709 for the `Add` trait.
@steveklabnik

Copy link
Copy Markdown
ContributorAuthor

@bors: r+ p=1

@bors

bors commented Aug 18, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 5daf280 has been approved by steveklabnik

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

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

@bors

bors commented Aug 18, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5daf280 with merge 3583984...

@bors

bors commented Aug 19, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

@sophiajt

Copy link
Copy Markdown
Contributor

Closing this for: #35826

@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

13 participants

@steveklabnik@bors@rust-highfive@sophiajt@alexcrichton@Centril@matthew-piziak@clementmiao@ErikUggeldahl@frewsxcv@GuillaumeGomez@cantino@pliniker