Skip to content

Rollup of 9 pull requests #45233

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 24 commits into from
Oct 13, 2017
Merged

Rollup of 9 pull requests #45233

merged 24 commits into from
Oct 13, 2017

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Oct 12, 2017 •
edited
Loading

leoyvens and others added 14 commits October 2, 2017 22:04
@leoyvens
Inline eq_slice into str::eq
bb74c20 
It's the only use of the function.
@alexcrichton
Update the jobserver crate
47fc913 
Brings in a bugfix to be compatible with the master branch of `make` where
jobserver fds are set in nonblocking mode
@camsteffen
fix documentation typo
e6728ec
@johnthagen
Fix PEP8 style issues in bootstrap code
a263a78
@QuietMisdreavus
let rustdoc print the crate version into docs
fcee950
@tinaun
unstable book: OIBIT
7735f59
@tinaun
unstable book: unboxed_closures
364148d
@tinaun
unstable book: fn_traits
d078252
@oli-obk
Upgrade some comments to doc comments
1cb9f70
@petrochenkov
Shorten some test names
ca61ea2 
Paths to object files generated from them were too long and caused errors
@QuietMisdreavus
render the rust version into std/compiler/test docs
7ea286e
@tinaun
formatting fixes
d5ef9f9
@johnthagen
Merge branch 'master' into pep8-bootstrap
23a5fb8
@johnthagen
Fix typo during merge from master
3cb5294
@rust-highfive
Copy link
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Contributor

r? @QuietMisdreavus

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

@kennytm
Copy link
Member Author

kennytm commented Oct 12, 2017

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

📌 Commit 7383e9f has been approved by kennytm

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

⌛ Testing commit 7383e9f39abc06253efdc65198371a32f0a28679 with merge 224a5ce795736dccbc8f47697afcd97390648227...

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member Author

kennytm commented Oct 12, 2017

@bors retry

Some android UI tests failed with broken-pipe or connection-reset-by-peer. Can't see the correlation between tests, and there isn't an obvious suspect either. Hoping it was spurious.

[00:50:51] failures:
[00:50:51] 
[00:50:51] ---- [ui] ui/deriving-meta-empty-trait-list.rs stdout ----
[00:50:51] 	
[00:50:51] error: test run failed!
[00:50:51] status: exit code: 101
[00:50:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/remote-test-client" "run" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/deriving-meta-empty-trait-list.stage2-arm-linux-androideabi"
[00:50:51] stdout:
[00:50:51] ------------------------------------------
[00:50:51] uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/deriving-meta-empty-trait-list.stage2-arm-linux-androideabi", waiting for result
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] stderr:
[00:50:51] ------------------------------------------
[00:50:51] thread 'main' panicked at 'client.read_exact(&mut header) failed with failed to fill whole buffer', /checkout/src/tools/remote-test-client/src/main.rs:263:8
[00:50:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] 
[00:50:51] thread '[ui] ui/deriving-meta-empty-trait-list.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2425:8
[00:50:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:51] 
[00:50:51] ---- [ui] ui/enum-size-variance.rs stdout ----
[00:50:51] 	
[00:50:51] error: test run failed!
[00:50:51] status: exit code: 101
[00:50:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/remote-test-client" "run" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/enum-size-variance.stage2-arm-linux-androideabi"
[00:50:51] stdout:
[00:50:51] ------------------------------------------
[00:50:51] uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/enum-size-variance.stage2-arm-linux-androideabi", waiting for result
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] stderr:
[00:50:51] ------------------------------------------
[00:50:51] thread 'main' panicked at 'client.into_inner() failed with Connection reset by peer (os error 104)', /checkout/src/tools/remote-test-client/src/main.rs:259:21
[00:50:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] 
[00:50:51] thread '[ui] ui/enum-size-variance.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2425:8
[00:50:51] 
[00:50:51] ---- [ui] ui/issue-19100.rs stdout ----
[00:50:51] 	
[00:50:51] error: test run failed!
[00:50:51] status: exit code: 101
[00:50:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/remote-test-client" "run" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issue-19100.stage2-arm-linux-androideabi"
[00:50:51] stdout:
[00:50:51] ------------------------------------------
[00:50:51] uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issue-19100.stage2-arm-linux-androideabi", waiting for result
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] stderr:
[00:50:51] ------------------------------------------
[00:50:51] thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', /checkout/src/tools/remote-test-client/src/main.rs:263:8
[00:50:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] 
[00:50:51] thread '[ui] ui/issue-19100.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2425:8
[00:50:51] 
[00:50:51] ---- [ui] ui/issue-43806.rs stdout ----
[00:50:51] 	
[00:50:51] error: test run failed!
[00:50:51] status: exit code: 101
[00:50:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/remote-test-client" "run" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issue-43806.stage2-arm-linux-androideabi"
[00:50:51] stdout:
[00:50:51] ------------------------------------------
[00:50:51] uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issue-43806.stage2-arm-linux-androideabi", waiting for result
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] stderr:
[00:50:51] ------------------------------------------
[00:50:51] thread 'main' panicked at 'client.into_inner() failed with Broken pipe (os error 32)', /checkout/src/tools/remote-test-client/src/main.rs:259:21
[00:50:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] 
[00:50:51] thread '[ui] ui/issue-43806.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2425:8
[00:50:51] 
[00:50:51] ---- [ui] ui/path-lookahead.rs stdout ----
[00:50:51] 	
[00:50:51] error: test run failed!
[00:50:51] status: exit code: 101
[00:50:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/remote-test-client" "run" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/path-lookahead.stage2-arm-linux-androideabi"
[00:50:51] stdout:
[00:50:51] ------------------------------------------
[00:50:51] uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/path-lookahead.stage2-arm-linux-androideabi", waiting for result
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] stderr:
[00:50:51] ------------------------------------------
[00:50:51] thread 'main' panicked at 'client.into_inner() failed with Broken pipe (os error 32)', /checkout/src/tools/remote-test-client/src/main.rs:259:21
[00:50:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] 
[00:50:51] thread '[ui] ui/path-lookahead.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2425:8
[00:50:51] 
[00:50:51] ---- [ui] ui/span/unused-warning-point-at-signature.rs stdout ----
[00:50:51] 	
[00:50:51] error: test run failed!
[00:50:51] status: exit code: 101
[00:50:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/remote-test-client" "run" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/span/unused-warning-point-at-signature.stage2-arm-linux-androideabi"
[00:50:51] stdout:
[00:50:51] ------------------------------------------
[00:50:51] uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/span/unused-warning-point-at-signature.stage2-arm-linux-androideabi", waiting for result
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] stderr:
[00:50:51] ------------------------------------------
[00:50:51] thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', /checkout/src/tools/remote-test-client/src/main.rs:263:8
[00:50:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] 
[00:50:51] thread '[ui] ui/span/unused-warning-point-at-signature.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2425:8
[00:50:51] 
[00:50:51] ---- [ui] ui/test-should-panic-attr.rs stdout ----
[00:50:51] 	
[00:50:51] error: test run failed!
[00:50:51] status: exit code: 101
[00:50:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/remote-test-client" "run" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/test-should-panic-attr.stage2-arm-linux-androideabi"
[00:50:51] stdout:
[00:50:51] ------------------------------------------
[00:50:51] uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/test-should-panic-attr.stage2-arm-linux-androideabi", waiting for result
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] stderr:
[00:50:51] ------------------------------------------
[00:50:51] thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', /checkout/src/tools/remote-test-client/src/main.rs:263:8
[00:50:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:51] 
[00:50:51] ------------------------------------------
[00:50:51] 
[00:50:51] thread '[ui] ui/test-should-panic-attr.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2425:8
[00:50:51] 
[00:50:51] 
[00:50:51] failures:
[00:50:51]     [ui] ui/deriving-meta-empty-trait-list.rs
[00:50:51]     [ui] ui/enum-size-variance.rs
[00:50:51]     [ui] ui/issue-19100.rs
[00:50:51]     [ui] ui/issue-43806.rs
[00:50:51]     [ui] ui/path-lookahead.rs
[00:50:51]     [ui] ui/span/unused-warning-point-at-signature.rs
[00:50:51]     [ui] ui/test-should-panic-attr.rs
[00:50:51] 
[00:50:51] test result: FAILED. 415 passed; 7 failed; 1 ignored; 0 measured; 0 filtered out

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

⌛ Testing commit 7383e9f39abc06253efdc65198371a32f0a28679 with merge 1ad9b1bde2a9305ae63d9cfd2d4fb7f22a7e7f9b...

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member Author

kennytm commented Oct 12, 2017

@bors retry

This time only one UI test died, so the previous error is very likely spurious, but why the Android tests suddenly become so fragile? 🤔

[00:50:33] failures:
[00:50:33] 
[00:50:33] ---- [ui] ui/test-should-panic-attr.rs stdout ----
[00:50:33] 	
[00:50:33] error: test run failed!
[00:50:33] status: exit code: 3
[00:50:33] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/remote-test-client" "run" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/test-should-panic-attr.stage2-arm-linux-androideabi"
[00:50:33] stdout:
[00:50:33] ------------------------------------------
[00:50:33] uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/test-should-panic-attr.stage2-arm-linux-androideabi", waiting for result
[00:50:33] 
[00:50:33] running 5 tests
[00:50:33] test test2 ... ok
[00:50:33] died due to signal 11
[00:50:33] 
[00:50:33] ------------------------------------------
[00:50:33] stderr:
[00:50:33] ------------------------------------------
[00:50:33] 
[00:50:33] ------------------------------------------
[00:50:33] 
[00:50:33] thread '[ui] ui/test-should-panic-attr.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:2425:8
[00:50:33] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:50:33] 
[00:50:33] 
[00:50:33] failures:
[00:50:33]     [ui] ui/test-should-panic-attr.rs
[00:50:33] 
[00:50:33] test result: FAILED. 421 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

⌛ Testing commit 7383e9f39abc06253efdc65198371a32f0a28679 with merge a65711528a0a97e79aaf0a919eabc877dffa2484...

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

💔 Test failed - status-travis

@kennytm
Rollup merge of rust-lang#45105 - camsteffen:patch-2, r=pnkfelix
ff53dc7 
Fix rustc documentation typo

I'm new to rustc but this looks like a typo.
@kennytm
Rollup merge of rust-lang#45121 - johnthagen:pep8-bootstrap, r=alexcr…
6944768 
…ichton

Fix PEP8 style issues in bootstrap code

This fixes PEP8 style issues (other than line-length) in the bootstrap Python code.

The most important fix is in the `set` function where the code was indented with 6 spaces instead of 4.
@kennytm
Rollup merge of rust-lang#45166 - tinaun:more_unstable_docs, r=stevek…
7640cda 
…labnik

Documented a few more unstable feature gates.

unboxed closures, fn_traits, and OIBIT. hope these are decent!
@kennytm
Rollup merge of rust-lang#45172 - oli-obk:patch-8, r=pnkfelix
db6fdf6 
Upgrade some comments to doc comments
@kennytm
Rollup merge of rust-lang#45190 - petrochenkov:shorten, r=alexcrichton
e1a6795 
Shorten some test names

An immediate fix for the first issue in rust-lang#45103
r? @alexcrichton
@kennytm
Fix typo in libsyntax/parse/lexer/unicode_chars.rs
19901df 
` (U+0060) should be the "grave" accent, not "Greek" accent.
@kennytm
Rollup merge of rust-lang#45231 - kennytm:patch-1, r=petrochenkov
45e4c19 
Fix typo in libsyntax/parse/lexer/unicode_chars.rs

`` ` `` (U+0060) should be the "grave" accent, not "Greek" accent.
@kennytm
Copy link
Member Author

kennytm commented Oct 12, 2017

@bors try

Removed #45163, try to see if this is the cause.

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

⌛ Trying commit 14546f1 with merge 6f8b325...

bors added a commit that referenced this pull request Oct 12, 2017
@bors
Auto merge of #45233 - kennytm:rollup, r=<try>
6f8b325 
[WIP] Rollup of 10 pull requests

- Successful merges: #44989, #45005, #45049, #45105, #45121, #45163, #45166, #45172, #45190, #45231
- Failed merges: #45138
@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 12, 2017
@bors
Copy link
Collaborator

bors commented Oct 12, 2017

☀️ Test successful - status-travis
State: approved= try=True

@kennytm kennytm changed the title [WIP] Rollup of 10 pull requests Rollup of 9 pull requests Oct 12, 2017
@kennytm
Copy link
Member Author

kennytm commented Oct 12, 2017

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 12, 2017

📌 Commit 45e4c19 has been approved by kennytm

@kennytm kennytm mentioned this pull request Oct 12, 2017
Closed
@bors
Copy link
Collaborator

bors commented Oct 12, 2017

⌛ Testing commit 45e4c19 with merge 64ee7d1...

bors added a commit that referenced this pull request Oct 12, 2017
@bors
Auto merge of #45233 - kennytm:rollup, r=kennytm
64ee7d1 
Rollup of 9 pull requests

- Successful merges: #44989, #45005, #45049, #45105, #45121, #45166, #45172, #45190, #45231
- Failed merges: #45138
@bors
Copy link
Collaborator

bors commented Oct 13, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 64ee7d1 to master...

@bors bors merged commit 45e4c19 into rust-lang:master Oct 13, 2017
This was referenced Oct 13, 2017
Merged
Merged
Closed
Closed
@kennytm kennytm deleted the rollup branch October 13, 2017 04:21
@kennytm kennytm mentioned this pull request Oct 13, 2017
Closed
@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
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.