Skip to content

Conversation

@Manishearth
Copy link
Member Author

@bors r+ p=20 force

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

📌 Commit 74bd544 has been approved by Manishearth

@rust-highfive
Copy link
Contributor

r? @huonw

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

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

⌛ Testing commit 74bd544 with merge 7a57209...

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

💔 Test failed - auto-linux-64-x-android-t

@Manishearth
Copy link
Member Author

@bors r+ force

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

📌 Commit 34da3ce has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

⌛ Testing commit 34da3ce with merge b82149e...

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

💔 Test failed - auto-linux-64-x-android-t

@Manishearth
Copy link
Member Author

@bors r+ force

@Manishearth
Copy link
Member Author

@bors force

1 similar comment
@Manishearth
Copy link
Member Author

@bors force

@Manishearth
Copy link
Member Author

@bors r+ p=20 force

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

📌 Commit 00719c4 has been approved by Manishearth

@Manishearth
Copy link
Member Author

@bors force

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

⌛ Testing commit 00719c4 with merge 952641f...

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

💔 Test failed - auto-linux-32-opt

Originally in an example it reads as follows:
```rust
fn inverse<T>() -> T
        // this is using ConvertTo as if it were "ConvertFrom<i32>"
         where i32: ConvertTo<T> {
     42.convert()
 }
```
There was no mention of `ConvertFrom` elsewhere in the page other than in this comment. Is this supposed to be `ConvertTo<i64>` ?
I'm confused by this example.
…st-inside-other-languages.md, r=steveklabnik

The embed rust file that we compile prints out 'Thread finished..' messages along with a 'done!' r? @steveklabnik
And replace more `0 as *const T`/`0 as *mut T`s with `null()`/`null_mut()`s

I'm not sure what is the general policy about making simple functions `const`, but `null()` and `null_mut()` seem to be good candidates.
Makes things more greppable.

This change was made automatically by clippy + bash scripts, though I will run test passes, please review carefully.
Nothing too big, a few needless returns and a few closures eliminated (the latter may improve performance in some cases, at least compilation should be a bit faster).
…ests, r=alexcrichton

@alexcrichton this will get the bitrig buildbot back to green.
@Manishearth
Copy link
Member Author

@bors r+ p=20 force

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

📌 Commit e6e175b has been approved by Manishearth

bors added a commit that referenced this pull request Sep 3, 2015
@bors
Copy link
Collaborator

bors commented Sep 3, 2015

⌛ Testing commit e6e175b with merge 1b908be...

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

💔 Test failed - auto-linux-32-opt

@steveklabnik
Copy link
Contributor

@bors: retry force

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

@bors bors merged commit e6e175b into rust-lang:master Sep 4, 2015
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.