Skip to content

Rollup of 15 pull requests - #53765

Closed
kennytm wants to merge 35 commits into
rust-lang:masterfrom
kennytm:rollup
Closed

Rollup of 15 pull requests#53765
kennytm wants to merge 35 commits into
rust-lang:masterfrom
kennytm:rollup

Conversation

@kennytm

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Roman Proskuryakovand others added 30 commits August 6, 2018 17:33
It's a ~1% win on `keccak` and `inflate`.
This typo was introduced in rust-lang#47334.
A couple tests bitrotted as a result, so we fix those too, and move them
to a more sensible place.
…q-example, r=QuietMisdreavus
Add another PartialEq example
r? @steveklabnik
…omez
Add example for Cow
Add one more example that shows how to keep `Cow` in a struct.
Link to playground: https://play.rust-lang.org/?gist=a9256bdd034b44bc3cdd0044bbcdbb7c&version=stable&mode=debug&edition=2015
Users ask this question in [ruRust](https://gitter.im/ruRust/general) chat time to time and it is not obvious to add `ToOwned<Owned=Target>` to requirements of generic params.
…, r=pnkfelix
remove `let x = baz` which was obscuring the real error
fixesrust-lang#51172
Use FxHash{Map,Set} instead of the default Hash{Map,Set} everywhere in rustc.
Most of the compiler uses the `Fx` hasher but some places ended up with the default one.
… r=varkor
Force-inline `shallow_resolve` at its hottest call site.
It's a ~1% win on `keccak` and `inflate`.
cleanup: Add main functions to some UI tests
set applicability
Update a few more calls as described in rust-lang#50723
r? @estebank
…o_vis_matcher, r=cramertj
Fix stabilisation version for macro_vis_matcher.
r? @cramertj
…, r=nikomatsakis
Do not suggest dereferencing in macro
Fixrust-lang#52783.
save-analysis: Differentiate foreign functions and statics.
fix a typo: taget_env -> target_env
This typo was introduced in rust-lang#47334. A couple tests bitrotted as a result, so we fix those too, and move them to a more sensible place.
Is there some lint we could turn on that would've caught this? It's a drag that cfg typos can silently pass through the compiler.
…etMisdreavus
Rustdoc fixes
Fixes rustdoc not scrolling to given lines and invalid unstable display:
<img width="1440" alt="screen shot 2018-08-27 at 23 28 47" src="https://user-images.githubusercontent.com/3050060/44687252-06535e80-aa51-11e8-8512-d7d34d1cb963.png">
r? @QuietMisdreavus
@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=15

@bors

bors commented Aug 28, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit bbe0a8e has been approved by kennytm

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 28, 2018
@bors

bors commented Aug 28, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit bbe0a8e with merge 7caf3090b47ff16b1012b107eca81d9b16bbf270...

@bors

bors commented Aug 28, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@borsbors 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 Aug 28, 2018
@rust-highfive

Copy link
Copy Markdown
Contributor

The job dist-x86_64-musl 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.
[00:45:11] [00:45:11] ---- [ui] ui/panic-runtime/runtime-depend-on-needs-runtime.rs stdout ----
[00:45:11] diff of stderr:
[00:45:11] [00:45:11] 1 error: the crate `depends` cannot depend on a crate that needs a panic runtime, but it depends on `needs_panic_runtime`
[00:45:11] - error: aborting due to previous error
[00:45:11] - error: aborting due to previous error
[00:45:11] + error: language item required, but not found: `eh_personality`
[00:45:11] + error: aborting due to 2 previous errors
[00:45:11] 4 [00:45:11] 5 [00:45:11] [00:45:11] [00:45:11] [00:45:11] The actual stderr differed from the expected stderr.
[00:45:11] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-runtime/runtime-depend-on-needs-runtime/runtime-depend-on-needs-runtime.stderr
[00:45:11] To update references, rerun the tests and pass the `--bless` flag
[00:45:11] To only update this specific test, also pass `--test-args panic-runtime/runtime-depend-on-needs-runtime.rs`
[00:45:11] error: 1 errors occurred comparing output.
[00:45:11] status: exit code: 1
[00:45:11] status: exit code: 1
[00:45:11] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs" "--target=x86_64-unknown-linux-musl" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-runtime/runtime-depend-on-needs-runtime/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-musl/native/rust-test-helpers" "-Clinker=/musl-x86_64/bin/musl-gcc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-runtime/runtime-depend-on-needs-runtime/auxiliary" "-A" "unused"
[00:45:11] ------------------------------------------
[00:45:11] [00:45:11] ------------------------------------------
[00:45:11] stderr:
[00:45:11] stderr:
[00:45:11] ------------------------------------------
[00:45:11] {"message":"the crate `depends` cannot depend on a crate that needs a panic runtime, but it depends on `needs_panic_runtime`","code":null,"level":"error","spans":[],"children":[],"rendered":"error: the crate `depends` cannot depend on a crate that needs a panic runtime, but it depends on `needs_panic_runtime`\n\n"}
[00:45:11] {"message":"language item required, but not found: `eh_personality`","code":null,"level":"error","spans":[],"children":[],"rendered":"error: language item required, but not found: `eh_personality`\n\n"}
[00:45:11] {"message":"aborting due to 2 previous errors","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to 2 previous errors\n\n"}
[00:45:11] ------------------------------------------
[00:45:11] [00:45:11] thread '[ui] ui/panic-runtime/runtime-depend-on-needs-runtime.rs' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:3196:9
[00:45:11] note: Run with `RUST_BACKTRACE=1` for a backtrace.
---
[00:45:11] [00:45:11] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:497:22
[00:45:11] [00:45:11] [00:45:11] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-musl/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-musl" "--mode" "ui" "--target" "x86_64-unknown-linux-musl" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "/musl-x86_64/bin/musl-gcc" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options -Lnative=/checkout/obj/build/x86_64-unknown-linux-musl/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "7.0.0\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[00:45:11] [00:45:11] [00:45:11] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target x86_64-unknown-linux-musl
[00:45:11] Build completed unsuccessfully in 0:41:35
---
travis_time:end:159dd4c8:start=1535489202835395418,finish=1535489202843827756,duration=8432338
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:005f8aac
$ 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 -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
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:03d5eefa
travis_time:start:03d5eefa
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:230a2943
$ dmesg | grep -i kill

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)

@kennytmkennytm closed this Aug 29, 2018
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

16 participants

@kennytm@bors@rust-highfive@Centril@RalfJung@nnethercote@GuillaumeGomez@petrochenkov@jkozlowski@jcpst@estebank@emilio@oconnor663@nikomatsakis@oli-obk@eddyb