Skip to content

Rollup of 5 pull requests - #60410

Closed
Centril wants to merge 13 commits into
rust-lang:masterfrom
Centril:rollup-6nxm3qv
Closed

Rollup of 5 pull requests#60410
Centril wants to merge 13 commits into
rust-lang:masterfrom
Centril:rollup-6nxm3qv

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Centriland others added 13 commits April 28, 2019 16:14
…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#60365rust-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)
Fixesrust-lang#59192
r? @matthewjasper
…e, r=oli-obk
Require a trait in the bounds of existential types
Fixesrust-lang#53090
r? @oli-obk
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=5

@bors

bors commented Apr 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit eccb332 has been approved by Centril

@borsbors 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
@CentrilCentril closed this Apr 30, 2019
@Centril
Centril deleted the rollup-6nxm3qv branch April 30, 2019 13:08
@rust-highfive

Copy link
Copy Markdown
Contributor

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:18efa2de:start=1556629058034760298,finish=1556629143591468912,duration=85556708614
$ 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:12:08] .................................................................................................... 300/2958
[01:12:19] .................................................................................................... 400/2958
[01:12:28] .................................................................................................... 500/2958
[01:12:39] .................................................................................................... 600/2958
[01:12:54] ...........................................................................F........................ 700/2958
[01:13:13] .................................................................................................... 900/2958
[01:13:28] .................................................................................................... 1000/2958
[01:13:42] .................................................................................................... 1100/2958
[01:13:51] .................................................................................................... 1200/2958
---
[01:18:05] failures:
[01:18:05] [01:18:05] ---- [run-pass] run-pass/existential_type.rs stdout ----
[01:18:05] [01:18:05] error: test compilation failed although it shouldn't!
[01:18:05] status: exit code: 1
[01:18:05] 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:18:05] ------------------------------------------
[01:18:05] [01:18:05] ------------------------------------------
[01:18:05] stderr:
[01:18:05] stderr:
[01:18:05] ------------------------------------------
[01:18:05] error: at least one trait must be specified
[01:18:05] --> /checkout/src/test/run-pass/existential_type.rs:71:46
[01:18:05] |
[01:18:05] LL | existential type GenericBound<'a, T: Trait>: 'a;
[01:18:05] [01:18:05] error: at least one trait must be specified
[01:18:05] --> /checkout/src/test/run-pass/existential_type.rs:78:42
[01:18:05] |
[01:18:05] |
[01:18:05] LL | pub existential type Passthrough<T>: 'static;
[01:18:05] [01:18:05] error: aborting due to 2 previous errors
[01:18:05] [01:18:05] ---
[01:18:05] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:517:22
[01:18:05] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:18:05] [01:18:05] [01:18:05] 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:18:05] [01:18:05] [01:18:05] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:18:05] Build completed unsuccessfully in 0:10:50
[01:18:05] Build completed unsuccessfully in 0:10:50
[01:18:05] make: *** [check] Error 1
[01:18:05] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0f7e3380
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Apr 30 14:17:17 UTC 2019
---
travis_time:end:1db83cdb:start=1556633838885557951,finish=1556633838890369518,duration=4811567
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1230c96e
$ 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:2134b08a
travis_time:start:2134b08a
$ 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:0f2d238b
$ 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)

@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-borsStatus: 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.

5 participants

@Centril@bors@rust-highfive@Manishearth@JohnTitor