Skip to content

Rollup of 14 pull requests - #36158

Closed
sophiajt wants to merge 34 commits into
rust-lang:masterfrom
sophiajt:rollup
Closed

Rollup of 14 pull requests#36158
sophiajt wants to merge 34 commits into
rust-lang:masterfrom
sophiajt:rollup

Conversation

matthew-piziakand others added 16 commits August 26, 2016 11:54
PR rust-lang#35695 for `Range` was approved, so it seems that this side-effect-free style is preferred for Range* examples. This PR performs the same translation for `RangeFrom` and `RangeInclusive`. It also removes what looks to be an erroneously commented line for `#![feature(step_by)]`, and an unnecessary primitive-type annotation in `0u8..`.
add `fn main` wrappers to enable Rust Playground "Run" button
These are exactly equivalent to PR rust-lang#35809, with one caveat: I do not believe there is a non-bitwise binary "xor" operator in Rust, so here it's expressed as (a || b) && !(a && b).
r? @GuillaumeGomez
improved documentation a la PR rust-lang#35993
@sophiajt

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=1

@bors

bors commented Aug 31, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 647d469 has been approved by jonathandturner

@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 31, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 647d469 with merge 7ab82e9...

@bors

bors commented Aug 31, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

fanzierand others added 2 commits August 31, 2016 13:50
…ng#36057. Adding expanded notes/context for what trait a parameter shadows as part of E0194 error messages.
Jonathan Turner added 4 commits August 31, 2016 06:28
…tln-remaining, r=GuillaumeGomez
accumulate vector and assert for RangeFrom and RangeInclusive examples
PR rust-lang#35695 for `Range` was merged, so it seems that this side-effect-free style is preferred for Range* examples. This PR performs the same translation for `RangeFrom` and `RangeInclusive`. It also removes what looks to be an erroneously commented line for `#![feature(step_by)]`, and an unnecessary primitive-type annotation in `0u8..`.
… r=GuillaumeGomez
add evocative examples for `BitOr` and `BitXor`
These are exactly equivalent to PR rust-lang#35809, with one caveat: I do not believe there is a non-bitwise binary XOR operator in Rust, so here it's expressed as `(a || b) && !(a && b)`.
Alternative decompositions are `(a && !b) || (!a && b)` and `(a || b) && (!a || !b)`. Let me know if you think one of those would be clearer.
r? @GuillaumeGomez
…andturner
Update compiler error E0076 to use new error format
Fixesrust-lang#35221 part of rust-lang#35233
r? @jonathandturner
Jonathan Turner added 12 commits August 31, 2016 06:28
…lexcrichton
Implement `Debug` for `std::path::{Components,Iter}`.
None
rustbook chapters/sections should be an ordered list.
Add test for rust-lang#14875
You can check this out in the playground https://is.gd/oVKC2T . It will fail on stable, but pass on nightly as @nagisa suggested on the issue.
Fixesrust-lang#14875
update E0265 to new format
Fixesrust-lang#35309 as part of rust-lang#35233.
I've describe partially bonus achieve in rust-lang#35309
r? @jonathandturner
…thandturner
Bonus format for E0194
Bonus fix for rust-lang#35280. Part of rust-lang#35233. Fixesrust-lang#36057. Adding expanded notes/context for what trait a parameter shadows as part of E0194 error messages.
Errors for E0194 now look like this:
```
$> ./build/x86_64-apple-darwin/stage1/bin/rustc src/test/compile-fail/E0194.rs
error[E0194]: type parameter `T` shadows another type parameter of the same name
--> src/test/compile-fail/E0194.rs:13:26
|
11 | trait Foo<T> { //~ NOTE first `T` declared here
| - first `T` declared here
12 | fn do_something(&self) -> T;
13 | fn do_something_else<T: Clone>(&self, bar: T);
| ^ shadows another type parameter
error: aborting due to previous error
```
r? @jonathandturner
Fix typo in PartialOrd docs
The inline code was formatted incorrectly because of the backtick.
@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.

18 participants

@sophiajt@bors@rust-highfive@alexcrichton@Centril@matthew-piziak@apasel422@frewsxcv@tshepang@athulappadan@cristicbz@0xmohit@GuillaumeGomez@acrrd@mikhail-m1@abhiQmar@fanzier@leikahing