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 7 pull requests #60412

Closed
wants to merge 17 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 30, 2019

Successful merges:

Failed merges:

r? @ghost

Aaron1011 and others added 17 commits April 27, 2019 20:33
Previously, we checked if the target of a projection type was itself an
inference variable. However, for Rustdoc rendering purposes, there's no
distinction between an inference variable ('_') and a type containing
one (e.g. (MyStruct<u8, _>)) - we don't want to render either of them.

Fixes rust-lang#60269

Due to the complexity of the original bug, which spans three different
crates (hyper, tower-hyper, and tower), I have been unable to create a
minimized reproduction for the issue.
Don't try to render auto-trait bounds with any inference variables

Previously, we checked if the target of a projection type was itself an
inference variable. However, for Rustdoc rendering purposes, there's no
distinction between an inference variable ('_') and a type containing
one (e.g. (MyStruct<u8, _>)) - we don't want to render either of them.

Fixes rust-lang#60269

Due to the complexity of the original bug, which spans three different
crates (hyper, tower-hyper, and tower), I have been unable to create a
minimized reproduction for the issue.
…cepted, r=oli-obk

Cleanup declare_features! for 'accepted' with a uniform style + sort them

r? @oli-obk

cc rust-lang#60362
cc rust-lang#60361
…tive, r=oli-obk

Cleanup 'active' declare_features! with uniform style + sorting.

r? @oli-obk

(added the FIXME you wanted)
cc rust-lang#60354
cc rust-lang#60361
…llaumeGomez

Revert "Update Source Code Pro fonts to version 2.030"

Temporary fix for rust-lang#60365

rust-lang#60146 updated all fonts (not just the fonts that were buggy), however it looks like the new Source Code Pro is buggy.

We should test this out of tree: `cargo doc` on anything, replace the font in `target/doc`, and use `python -m SimpleHTTPServer` to see what's going on.

Till we figure that out, I'll just back this out.

r? @GuillaumeGomez

This reverts commit 6bafc58.
…ewjasper

Remove functions to simplify handling of feature(bind_by_move_pattern_guards)

Fixes rust-lang#59192

r? @matthewjasper
Add missing f16c_target_feature check to typeck collect
…e, r=oli-obk

Require a trait in the bounds of existential types

Fixes rust-lang#53090

r? @oli-obk
@Centril
Copy link
Contributor Author

Centril commented Apr 30, 2019

@bors r+ p=7

@bors
Copy link
Contributor

bors commented Apr 30, 2019

📌 Commit 28f09a2 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 Apr 30, 2019
@Centril Centril closed this Apr 30, 2019
@Centril Centril deleted the rollup-zdmn61s branch April 30, 2019 14:08
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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.
travis_time:end:259b1a61:start=1556630128815116951,finish=1556630213828774618,duration=85013657667
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[01:11:08] .................................................................................................... 300/2958
[01:11:18] .................................................................................................... 400/2958
[01:11:27] .................................................................................................... 500/2958
[01:11:39] .................................................................................................... 600/2958
[01:11:54] ...........................................................................F........................ 700/2958
[01:12:14] .................................................................................................... 900/2958
[01:12:29] .................................................................................................... 1000/2958
[01:12:42] .................................................................................................... 1100/2958
[01:12:52] .................................................................................................... 1200/2958
---
[01:17:12] failures:
[01:17:12] 
[01:17:12] ---- [run-pass] run-pass/existential_type.rs stdout ----
[01:17:12] 
[01:17:12] error: test compilation failed although it shouldn't!
[01:17:12] status: exit code: 1
[01:17:12] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-pass/existential_type.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/existential_type/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/existential_type/auxiliary"
[01:17:12] ------------------------------------------
[01:17:12] 
[01:17:12] ------------------------------------------
[01:17:12] stderr:
[01:17:12] stderr:
[01:17:12] ------------------------------------------
[01:17:12] error: at least one trait must be specified
[01:17:12]   --> /checkout/src/test/run-pass/existential_type.rs:71:46
[01:17:12]    |
[01:17:12] LL | existential type GenericBound<'a, T: Trait>: 'a;
[01:17:12] 
[01:17:12] error: at least one trait must be specified
[01:17:12]   --> /checkout/src/test/run-pass/existential_type.rs:78:42
[01:17:12]    |
[01:17:12]    |
[01:17:12] LL |     pub existential type Passthrough<T>: 'static;
[01:17:12] 
[01:17:12] error: aborting due to 2 previous errors
[01:17:12] 
[01:17:12] 
---
[01:17:12] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:517:22
[01:17:12] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:17:12] 
[01:17:12] 
[01:17:12] 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-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-pass" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-pass" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:17:12] 
[01:17:12] 
[01:17:12] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:17:12] Build completed unsuccessfully in 0:11:00
[01:17:12] Build completed unsuccessfully in 0:11:00
[01:17:12] make: *** [check] Error 1
[01:17:12] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:01216b86
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Apr 30 14:34:15 UTC 2019
---
travis_time:end:07208f76:start=1556634857210989565,finish=1556634857215890524,duration=4900959
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:05f3d105
$ 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
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:03b7b66f
travis_time:start:03b7b66f
$ 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:0a171200
$ 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)

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants