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 10 pull requests #60092

Closed
wants to merge 33 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 18, 2019

Successful merges:

Failed merges:

r? @ghost

koalatux and others added 30 commits April 16, 2019 20:41
The documentation for `rchunks_exact` said it started at the beginning
of the slice, bit it actually starts at the end of the slice.

In addition, there were a couple of "of the slice of the slice"
duplicate phrases going on for `rchunks_exact` and `rchunks_exact_mut`.

This fixes rust-lang#60068.
…, r=wesleywiser

Implement event filtering for self-profiler.

This is a first sketch for event filtering in the self-profiler, something that we'll want in order to keep profiling overhead low in the common case. The PR contains the commits from rust-lang#59515 and, for the moment, is meant for performance testing.

r? @wesleywiser
implement specialized nth_back() for Bytes, Fuse and Enumerate

Hi,

After my first PR has been successfully merged, here is my second pull request :-)

Also this PR contains some specializations for the problem discussed in rust-lang#54054.
…lexcrichton

Add codegen test for PGO instrumentation.

This PR adds a codegen test that makes sure that LLVM actually generates instrumentation code when we enable PGO instrumentation in `rustc`.

The second commit updates a test case to the new commandline option syntax introduced in rust-lang#59874. Without the fix the test still works, but it confusingly creates a directory called `test.profraw`, which usually is the name of the _file_ where profiling data is collected.
Simplify the returning of a Result a bit
whitelist RTM x86 target cpu feature

This PR adds support for intels restricted transactional memory cpu feature. I mostly copied what was done for the [movbe](rust-lang#57999) feature.

rust-lang/stdarch#718
Point at try `?` on errors affecting the err match arm of the desugared code

Fix rust-lang#59980.
Fix small errors in docs for `rchunks_exact` and `rchunks_exact_mut`.

The documentation for `rchunks_exact` said it started at the beginning
of the slice, bit it actually starts at the end of the slice.

In addition, there were a couple of "of the slice of the slice"
duplicate phrases going on for `rchunks_exact` and `rchunks_exact_mut`.

This fixes rust-lang#60068.
…ate, r=cramertj

Feature gate async methods

Fixes rust-lang#60069.
@Centril
Copy link
Contributor Author

Centril commented Apr 18, 2019

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Apr 18, 2019

📌 Commit 22d9083 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 18, 2019
@bors
Copy link
Contributor

bors commented Apr 18, 2019

⌛ Testing commit 22d9083 with merge 5f2a5e4ee0e27888451627a99234d74a1f24e0c9...

@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:09526ea0:start=1555618297614667313,finish=1555618409389483009,duration=111774815696
$ 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:05:56] .................................................................................................... 1200/5544
[01:05:59] .................................................................................................... 1300/5544
[01:06:01] .................................................................................................... 1400/5544
[01:06:05] .................................................................................................... 1500/5544
[01:06:07] ..........................F......................................................................... 1600/5544
[01:06:14] .................................................................................................... 1800/5544
[01:06:18] .................................................................................................... 1900/5544
[01:06:22] .................................................................................................... 2000/5544
[01:06:25] ...................................................................................................i 2100/5544
---
[01:08:40] failures:
[01:08:40] 
[01:08:40] ---- [ui] ui/feature-gates/feature-gate-async-await.rs stdout ----
[01:08:40] 
[01:08:40] error: /checkout/src/test/ui/feature-gates/feature-gate-async-await.rs:12: unexpected error: '12:5: 12:20: async fn is unstable [E0658]'
[01:08:40] error: 1 unexpected errors found, 0 expected errors not found
[01:08:40] status: exit code: 1
[01:08:40] status: exit code: 1
[01:08:40] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/feature-gates/feature-gate-async-await.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/ui/feature-gates/feature-gate-async-await/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--edition=2018" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/feature-gates/feature-gate-async-await/auxiliary" "-A" "unused"
[01:08:40]     Error {
[01:08:40]         line_num: 12,
[01:08:40]         kind: Some(
[01:08:40]             Error,
[01:08:40]             Error,
[01:08:40]         ),
[01:08:40]         msg: "12:5: 12:20: async fn is unstable [E0658]",
[01:08:40] ]
[01:08:40] 
[01:08:40] thread '[ui] ui/feature-gates/feature-gate-async-await.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:1400:13
[01:08:40] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
---
[01:08:40] 
[01:08:40] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:517:22
[01:08:40] 
[01:08:40] 
[01:08:40] 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/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--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:08:40] 
[01:08:40] 
[01:08:40] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:08:40] Build completed unsuccessfully in 0:04:30
[01:08:40] Build completed unsuccessfully in 0:04:30
[01:08:40] Makefile:48: recipe for target 'check' failed
[01:08:40] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1420f81e
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Apr 18 21:22:20 UTC 2019
---
travis_time:end:36158e39:start=1555622541637450055,finish=1555622541644980615,duration=7530560
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:032327f6
$ 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:0266ca6e
$ 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
Copy link
Contributor Author

Centril commented Apr 18, 2019

@bors r- retry

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 18, 2019
@Centril Centril closed this Apr 18, 2019
@Centril Centril deleted the rollup-rmwr418 branch April 18, 2019 21: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-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.