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 5 pull requests #62242

Closed
wants to merge 14 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 29, 2019

Successful merges:

Failed merges:

r? @ghost

JohnTitor and others added 14 commits June 25, 2019 23:09
Fix a typo in `libcore/char/methods.rs`
…tsakis

Update new_debug_unreachable

In latest master, smallvec has been updated. So we only update new_debug_unreachable to remove unmaintained dependencies.
…thewjasper

Adjust warning of -C extra-filename with -o.

If `--emit` includes multiple unnamed outputs, and `-o` was specified, and `-C extra-filename` was specified, the compiler would warn that `-C extra-filename` was ignored, but this is not true.  The "adapting" of the filenames includes the extra-filename info.

Since this is a little convoluted and hard to follow, here is a little chart to summarize when running with `rustc foo.rs -o xyz -C extra-filename=asdf`

`--emit` | Result
---------|--------
`link` | `xyz` (extra-filename ignored)
`link,dep-info` | `xyzasdf`, `xyzasdf.d` (this PR removes the incorrect warning)

As to whether or not this behavior is the best choice is another question.
…omez

rustdoc: remove unused derives and variants

Though many structs in rustdoc derive `RustcEncodable` and `RustcDecodable`, the impls do not appear to be used by the crate or its dependents. Removing them revealed some enum variants that are never constructed, too.

r? @GuillaumeGomez
…entril

Extend the `#[must_use]` lint to arrays

Based on top of rust-lang#62228.

r? @Centril
…kennytm

Fix a typo

The definition of 京 seems to be capital, but not capitol.
[reference](https://en.wiktionary.org/wiki/%E4%BA%AC#Etymology_1)
[another reference](https://jisho.org/word/%E4%BA%AC)
@Centril
Copy link
Contributor Author

Centril commented Jun 29, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Jun 29, 2019

📌 Commit f58e80f has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 29, 2019
@bors
Copy link
Contributor

bors commented Jun 29, 2019

⌛ Testing commit f58e80f with merge 6338ca593d36f4eb575772d9e7257e2a2f1c9b23...

@bors
Copy link
Contributor

bors commented Jun 30, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[01:49:04] test [ui] run-pass/issue-27901.rs ... ok
[01:49:04] thread '[ui] run-pass/issue-30530.rs' panicked at 'explicit panic', /cargo/registry/src/github.com-1ecc6299db9ec823/compiletest_rs-0.3.22/src/runtest.rs:2632:9
[01:49:04] note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:49:04] normalized stderr:
[01:49:04] error: unused boxed `std::ops::Fn` trait object that must be used
[01:49:04]    |
[01:49:04]    |
[01:49:04] 24 |     take(Handler::Default, Box::new(main));
[01:49:04]    |
[01:49:04]    = note: `-D unused-must-use` implied by `-D unused`
[01:49:04]    = note: `-D unused-must-use` implied by `-D unused`
[01:49:04]    = note: closures are lazy and do nothing unless called
[01:49:04] error: aborting due to previous error
[01:49:04] 
[01:49:04] 
[01:49:04] 
[01:49:04] 
[01:49:04] expected stderr:
[01:49:04] 
[01:49:04] 
[01:49:04] diff of stderr:
[01:49:04] 
[01:49:04] +error: unused boxed `std::ops::Fn` trait object that must be used
[01:49:04] +   |
[01:49:04] +   |
[01:49:04] +24 |     take(Handler::Default, Box::new(main));
[01:49:04] +   |
[01:49:04] +   = note: `-D unused-must-use` implied by `-D unused`
[01:49:04] +   = note: `-D unused-must-use` implied by `-D unused`
[01:49:04] +   = note: closures are lazy and do nothing unless called
[01:49:04] +error: aborting due to previous error
[01:49:04] +
[01:49:04] +
[01:49:04] 
[01:49:04] 
[01:49:04] The actual stderr differed from the expected stderr.
[01:49:04] Actual stderr saved to /tmp/compiletestK1j1uS/issue-30530.stderr
[01:49:04] To update references, run this command from build directory:
[01:49:04] tests/run-pass/update-references.sh '/tmp/compiletestK1j1uS' 'issue-30530.rs'
[01:49:04] error: 1 errors occurred comparing output.
[01:49:04] status: exit code: 1
[01:49:04] status: exit code: 1
[01:49:04] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/issue-30530.rs" "-L" "/tmp/compiletestK1j1uS" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestK1j1uS/issue-30530.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "-L" "/tmp/compiletestK1j1uS/issue-30530.stage-id.aux" "-A" "unused"
[01:49:04] ------------------------------------------
[01:49:04] 
[01:49:04] ------------------------------------------
[01:49:04] stderr:
[01:49:04] stderr:
[01:49:04] ------------------------------------------
[01:49:04] {"message":"unused boxed `std::ops::Fn` trait object that must be used","code":{"code":"unused_must_use","explanation":null},"level":"error","spans":[{"file_name":"tests/run-pass/issue-30530.rs","byte_start":864,"byte_end":903,"line_start":24,"line_end":24,"column_start":5,"column_end":44,"is_primary":true,"text":[{"text":"    take(Handler::Default, Box::new(main));","highlight_start":5,"highlight_end":44}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`-D unused-must-use` implied by `-D unused`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"closures are lazy and do nothing unless called","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"error: unused boxed `std::ops::Fn` trait object that must be used\n  --> tests/run-pass/issue-30530.rs:24:5\n   |\n24 |     take(Handler::Default, Box::new(main));\n   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n   |\n   = note: `-D unused-must-use` implied by `-D unused`\n   = note: closures are lazy and do nothing unless called\n\n"}
[01:49:04] 
[01:49:04] ------------------------------------------
[01:49:04] 
[01:49:04] test [ui] run-pass/issue-30530.rs ... FAILED
---
travis_time:end:0214cc40:start=1561859074872804316,finish=1561859074891495552,duration=18691236
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:008e146c
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 30, 2019
@Centril Centril closed this Jun 30, 2019
@Centril Centril deleted the rollup-wuprmbu branch June 30, 2019 12:26
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 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 S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants