Skip to content
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

Rollup of 15 pull requests #24512

Merged
merged 19 commits into from
Apr 17, 2015
Merged

Rollup of 15 pull requests #24512

merged 19 commits into from
Apr 17, 2015

Conversation

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@steveklabnik
Copy link
Member Author

@bors: r+ p=1337

@bors
Copy link
Contributor

bors commented Apr 16, 2015

📌 Commit ed09a7c has been approved by steveklabnik

bors added a commit that referenced this pull request Apr 16, 2015
@bors
Copy link
Contributor

bors commented Apr 16, 2015

⌛ Testing commit ed09a7c with merge fb4ab3b...

@bors
Copy link
Contributor

bors commented Apr 16, 2015

💔 Test failed - auto-mac-32-opt

@steveklabnik
Copy link
Member Author

Rebased the fix into my commit

@steveklabnik
Copy link
Member Author

@bors: r+ p=1000

@bors
Copy link
Contributor

bors commented Apr 17, 2015

📌 Commit 2aab9a6 has been approved by steveklabnik

bors added a commit that referenced this pull request Apr 17, 2015
@bors
Copy link
Contributor

bors commented Apr 17, 2015

⌛ Testing commit 2aab9a6 with merge 88773f4...

@bors
Copy link
Contributor

bors commented Apr 17, 2015

💔 Test failed - auto-mac-32-opt

@bors
Copy link
Contributor

bors commented Apr 17, 2015

📌 Commit a4be1ec has been approved by steveklabnik

@steveklabnik
Copy link
Member Author

man, i screwed up today :(

bors added a commit that referenced this pull request Apr 17, 2015
@bors
Copy link
Contributor

bors commented Apr 17, 2015

⌛ Testing commit a4be1ec with merge b7fb575...

@bors
Copy link
Contributor

bors commented Apr 17, 2015

💔 Test failed - auto-linux-32-nopt-t

@Manishearth
Copy link
Member

---- [compile-fail] compile-fail/asm-src-loc-codegen-units.rs stdout ----

error: error pattern ' build without -C codegen-units for more exact errors' not found!
status: exit code: 101
command: i686-unknown-linux-gnu/stage2/bin/rustc /home/ubuntu/src/rust-buildbot/slave/auto-linux-32-nopt-t/build/src/test/compile-fail/asm-src-loc-codegen-units.rs -L i686-unknown-linux-gnu/test/compile-fail/ --target=i686-unknown-linux-gnu -L i686-unknown-linux-gnu/test/compile-fail/asm-src-loc-codegen-units.stage2-i686-unknown-linux-gnulibaux -C prefer-dynamic -o i686-unknown-linux-gnu/test/compile-fail/asm-src-loc-codegen-units.stage2-i686-unknown-linux-gnu --cfg rtopt --cfg ndebug -L i686-unknown-linux-gnu/rt -C codegen-units=2
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
thread 'error: <inline asm>:1:2: error: invalid instruction mnemonic 'nowayisthisavalidinstruction'
        nowayisthisavalidinstruction
        ^
codegen-1
' panicked at 'Box<Any>note: ', /home/ubuntu/src/rust-buildbot/slave/auto-linux-32-nopt-t/build/src/libsyntax/diagnostic.rsbuild without -C codegen-units for more exact errors:
171
error: aborting due to previous error
error: aborting due to worker thread panic

------------------------------------------

thread '[compile-fail] compile-fail/asm-src-loc-codegen-units.rs' panicked at 'explicit panic', /home/ubuntu/src/rust-buildbot/slave/auto-linux-32-nopt-t/build/src/compiletest/runtest.rs:1499


@Manishearth
Copy link
Member

@bors: retry force

Wait, looks like the note got hit by a race.

@bors
Copy link
Contributor

bors commented Apr 17, 2015

@Manishearth
Copy link
Member

Note: I'm working on the next rollup (https://github.com/Manishearth/rust/compare/rollup), but I haven't finished testing it yet so I'll wait for this to go through.

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.