Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Rollup of 13 pull requests #36177

Merged
merged 27 commits into from
Sep 1, 2016
Merged

Rollup of 13 pull requests #36177

merged 27 commits into from
Sep 1, 2016

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

Fixes rust-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

Fixes rust-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

Fixes rust-lang#36076
…richton

Unignore the json tests on 32-bit platforms

cc rust-lang#14064

r? @alexcrichton
…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
Contributor Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Aug 31, 2016

📌 Commit 5c97100 has been approved by jonathandturner

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@bors
Copy link
Contributor

bors commented Sep 1, 2016

⌛ 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:master Sep 1, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.