Skip to content

Rollup of 13 pull requests - #36177

Merged
bors merged 27 commits into
rust-lang:masterfrom
sophiajt:rollup
Sep 1, 2016
Merged

Rollup of 13 pull requests#36177
bors merged 27 commits into
rust-lang:masterfrom
sophiajt:rollup

Conversation

tbu-and others added 27 commits August 23, 2016 02:10
This makes it possible to use it as key in various maps.
This is the augmented-assignment version of PR rust-lang#35809.
r? @GuillaumeGomez
improved documentation a la PR rust-lang#35993
Fixed E0259 unit test
Added name of conflict to E0259's note
…urner
Change E0259 to the new error format
Fixesrust-lang#35514 as part of rust-lang#35233.
Sorry about creating a new PR I was having a lot of troubles squashing the commit because I didn't properly branch the new feature.
r? @GuillaumeGomez
…crichton
Implement more traits for `std::io::ErrorKind`
This makes it possible to use it as key in various maps.
…, r=GuillaumeGomez
replace `BitAndAssign` example with something more evocative
This is the augmented-assignment version of PR rust-lang#35809.
r? @GuillaumeGomez
…, r=steveklabnik
Add missing urls into convert module
r? @steveklabnik
Update E0393 to new error format
Fixesrust-lang#35632.
Part of rust-lang#35233.
r? @jonathandturner
and a wired thing is that if i add another label
```rust
.span_label(span, &format!("missing reference to `{}`", def.name))
.span_label(span, &format!("because of the default `Self` reference, type parameters must be specified on object types"))
```
and add a new note in the test case like
```rust
trait A<T=Self> {}
fn together_we_will_rule_the_galaxy(son: &A) {}
//~^ ERROR E0393
//~| NOTE missing reference to `T`
//~| NOTE because of the default `Self` reference, type parameters must be specified on object types
```
it will complain that
```
running 1 test
test [compile-fail] compile-fail/E0393.rs ... FAILED
failures:
---- [compile-fail] compile-fail/E0393.rs stdout ----
error: /Users/zjh/Documents/rustspace/rust/src/test/compile-fail/E0393.rs:13: unexpected "error": '13:43: 13:44: the type parameter `T` must be explicitly specified [E0393]'
unexpected errors (from JSON output): [
Error {
line_num: 13,
kind: Some(
Error
),
msg: "13:43: 13:44: the type parameter `T` must be explicitly specified [E0393]"
}
]
```
it is a little bit confusing and through the blog post we can use `//~^` and `//~|` to support multiple notes, @jonathandturner am i missing something here?
… r=brson
Fix the test_variadic_ptr fn on printf-less sys
Fixesrust-lang#36076
…chton
Fix run-pass/signal-exit-status to not trigger UB by writing to NULL.
`run-pass/signal-exit-status` has had UB (NULL dereference) since it was introduced in rust-lang#10109.
Fixes the test failure found by @camlorn while running under Windows Subsystem for Linux.
…komatsakis
Change 'rustc::plugin' to 'rustc_plugin' in doc comment
It looks like there is a missing one.
@sophiajt

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=1

@bors

bors commented Aug 31, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 5c97100 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 Sep 1, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5c97100 with merge 3135b78...

bors added a commit that referenced this pull request Sep 1, 2016
@bors
bors merged commit 5c97100 into rust-lang:masterSep 1, 2016
@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 rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

15 participants

@sophiajt@bors@rust-highfive@alexcrichton@Centril@tbu-@apasel422@king6cong@nagisa@eddyb@matthew-piziak@swr1bm86@dns2utf8@GuillaumeGomez@wdv4758h