Skip to content

Rollup of leftover PRs in the queue #22548

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 56 commits into from
Feb 22, 2015
Merged

Rollup of leftover PRs in the queue #22548

merged 56 commits into from
Feb 22, 2015

Conversation

Manishearth
Copy link
Member

I had most of these tested locally, why not get them out of the way too?

steveklabnik and others added 6 commits February 13, 2015 12:35
Otherwise, this line is a lie.
Adds an example of `else if` to the If section of The Rust Programming
Language.

r? @steveklabnik
Replaces the markdown link delimiters for the "Code of Conduct" link with the appropriate delimiters for using a link id

r? @steveklabnik
The text is referring to the io module despite the code using the old_io module.
In `if loop {} {}`, the `if` is actually unreachable, but we didn't
handle that correctly and when trying to translate the `if` we tried to
branch on the "return value" of the loop expression, which is not an
`i1` and therefore triggered an LLVM assertion.
@rust-highfive
Copy link
Contributor

r? @brson

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

@huonw
Copy link
Member

huonw commented Feb 19, 2015

@bors r+ 7e64 p=1

@dotdash
Copy link
Contributor

dotdash commented Feb 19, 2015

@bors r=huonw 1ecdb83

@bors
Copy link
Collaborator

bors commented Feb 19, 2015

⌛ Testing commit 1ecdb83 with merge 80317f5...

@bors
Copy link
Collaborator

bors commented Feb 20, 2015

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

@alexcrichton
Copy link
Member

@bors: r+ cf310d3

@alexcrichton
Copy link
Member

@bors: p=100

@bors
Copy link
Collaborator

bors commented Feb 20, 2015

⌛ Testing commit cf310d3 with merge 1102b2c...

bors added a commit that referenced this pull request Feb 20, 2015
I had most of these tested locally, why not  get them out of the way too?
ipetkov and others added 2 commits February 19, 2015 20:43
Checks include declaration/implementation of unsafe functions, traits,
and methods.

This allows warning or forbidding all uses of unsafe code, whereas
previously only unsafe blocks were caught by the lint.

The lint has been renamed from `unsafe-blocks` to `unsafe-code` to
reflect its new purpose.

This is a minor [breaking-change]

Closes rust-lang#22430
the punch line was cut off!
@bors
Copy link
Collaborator

bors commented Feb 20, 2015

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

@eddyb
Copy link
Member

eddyb commented Feb 20, 2015

@bors r=alexcrichton 7187ce1

@bors
Copy link
Collaborator

bors commented Feb 20, 2015

🙀 You have the wrong number! Please try again with 0184ecf.

@bors
Copy link
Collaborator

bors commented Feb 20, 2015

⌛ Testing commit 0184ecf with merge fcfd75f...

semarie and others added 2 commits February 20, 2015 11:03
@bors
Copy link
Collaborator

bors commented Feb 20, 2015

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

 The commit 1860ee5 has break the openbsd build.
Repair it.
@Manishearth
Copy link
Member Author

Restarting on the rollup since stuff changed and Windows hates me.

@Manishearth
Copy link
Member Author

@bors: r+ 686648d

@bors
Copy link
Collaborator

bors commented Feb 21, 2015

⌛ Testing commit 686648d with merge 2e20ff1...

bors added a commit that referenced this pull request Feb 21, 2015
I had most of these tested locally, why not  get them out of the way too?
@bors
Copy link
Collaborator

bors commented Feb 22, 2015

💔 Test failed - auto-mac-64-nopt-t

@Manishearth
Copy link
Member Author

@bors: retry

@Manishearth
Copy link
Member Author

@bors: r-

Oops, sorry, not an intermittent.

@Manishearth
Copy link
Member Author

@bors: r+ 686648d

---- ops::Deref_0 stdout ----
    error: could not exec the linker `cc`: no such file or directory
error: aborting due to previous error
thread 'ops::Deref_0' panicked at 'Box<Any>', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libsyntax/diagnostic.rs:151

Failure in a doctest (can't repro locally), seems like an intermittent to me :/

@bors
Copy link
Collaborator

bors commented Feb 22, 2015

⌛ Testing commit 686648d with merge 098f2ad...

bors added a commit that referenced this pull request Feb 22, 2015
I had most of these tested locally, why not  get them out of the way too?
@bors
Copy link
Collaborator

bors commented Feb 22, 2015

💔 Test failed - auto-mac-64-opt

@Manishearth
Copy link
Member Author

@bors: retry

@Manishearth
Copy link
Member Author

@bors: try

Just in case, so that we can hammer out any failures on mac.

@bors
Copy link
Collaborator

bors commented Feb 22, 2015

⌛ Testing commit 686648d with merge 6c182b4...

@Manishearth
Copy link
Member Author

Seems to have merged into auto, not try. O.o

@barosl
Copy link
Contributor

barosl commented Feb 22, 2015

@Manishearth This is normal. Homu tests tryed PRs just as the normal PRs, using the auto branch. It just doesn't merge it. (So you didn't have to close the other PR.)

The intention of this behavior was to get the exactly same test results from both the normal procedure and the try procedure. But I was told that using auto requires much more resources than using the try branch, so I'm thinking of changing the behavior to use try instead.

The issue is tracked at barosl/homu#50, if you are interested. I already fixed it in my local repository, but didn't test it enough. I'm planning to push it soon, after the tests are done.

@barosl
Copy link
Contributor

barosl commented Feb 22, 2015

For now, you can just fast-forward the merge commit made by Homu (6c182b4) to master, after the tests pass. As the exactly same tests are done, there would be no problems.

But I also hope the tests don't fail this time!

@Manishearth
Copy link
Member Author

Thanks, @barosl :)

I closed the other PR because I was afraid that if those tests passed, homu would merge auto into master, and it would merge the wrong branch.

@bors
Copy link
Collaborator

bors commented Feb 22, 2015

⌛ Testing commit 686648d with merge eb1b500...

bors added a commit that referenced this pull request Feb 22, 2015
I had most of these tested locally, why not  get them out of the way too?
@huonw huonw merged commit 686648d into rust-lang:master Feb 22, 2015
@Manishearth Manishearth deleted the rollup branch February 22, 2015 10:26
@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.