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 16 pull requests #61131

Closed
wants to merge 37 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 24, 2019

Successful merges:

Failed merges:

r? @ghost

spastorino and others added 30 commits May 23, 2019 22:17
If there is more than one license error, tidy would only print the first
error. This changes it so that all license errors are printed.
The example code under type-alias-bounds lint produced two warnings - one from the lint itself and another from the dead_code lint, and only the second one was in the doc. This looked like an error, so I've added `#[allow(dead_code)]` and replaced the example output with the expected one.
[Playground](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&code=%23%5Ballow(dead_code)%5D%0Atype%20SendVec%3CT%3A%20Send%3E%20%3D%20Vec%3CT%3E%3B)
My problem was user error; thanks to @Zoxc for fixing me!

r? @alexcrichton
It's just a waste of memory. This also gets rid of the special case for
"".
Before: Immediate(ScalarMaybeUndef(Scalar(Ptr(Pointer { alloc_id: AllocId(3401), offset: Size { raw: 4 }, tag: Tagged(7723) }))))
After: Immediate(Scalar(AllocId(3401).0x4[<7723>]))

Before: Immediate(ScalarMaybeUndef(Scalar(Bits { size: 8, bits: 10 })))
After: Immediate(Scalar(0x000000000000000A))

Before: Immediate(ScalarMaybeUndef(Scalar(Bits { size: 1, bits: 1 })))
After: Immediate(Scalar(0x01))
…henkov

Don't arena-allocate static symbols.

It's just a waste of memory. This also gets rid of the special case for
"".

r? @petrochenkov
…, r=oli-obk

Make sanitize_place iterate instead of recurse

r? @oli-obk
…i-obk

Make find_local iterate instead of recurse

r? @oli-obk
Update cargo

Update cargo

14 commits in c4fcfb725b4be00c72eb9cf30c7d8b095577c280..545f354259be4e9745ea00a524c0e4c51df01aa6
2019-05-15 19:48:47 +0000 to 2019-05-23 17:45:30 +0000
- Bump to 0.38.0 (rust-lang/cargo#6979)
- cargo package: detect new empty directories (rust-lang/cargo#6973)
- Add message caching. (rust-lang/cargo#6933)
- Fix typo (rust-lang/cargo#6974)
- Set `Finished` line correctly for debug=0. (rust-lang/cargo#6971)
- Clippy fixes (rust-lang/cargo#6970)
- Remove rustdoc `can_add_color_process`. (rust-lang/cargo#6968)
- Document new `doctest` field. (rust-lang/cargo#6965)
- Update some man pages that missed --offline. (rust-lang/cargo#6964)
- add public & private prop tests. (rust-lang/cargo#6962)
- zsh completion: Pull list of commands from cargo --list (rust-lang/cargo#6956)
- Change docs "inequality" for semver requirement. (rust-lang/cargo#6963)
- Update im-rc requirement from 12.1.0 to 13.0.0 (rust-lang/cargo#6959)
- Add `doctest` field into metadata (rust-lang/cargo#6953)
…=Centril

tidy: don't short-circuit on license error

If there is more than one license error, tidy would only print the first
error. This changes it so that all license errors are printed.
…=oli-obk

Make ignore_borrow iterate instead of recurse

r? @oli-obk
Fix a couple docs typos

Also add a link to env::split_paths.
…rk-Simulacrum

Revert edition-guide toolstate override

Closes rust-lang#60929
Fixed type-alias-bounds lint doc

The example code under type-alias-bounds lint produced two warnings - one from the lint itself and another from the dead_code lint, and only the second one was in the doc. This looked like an error, so I've added `#[allow(dead_code)]` and replaced the example output with the expected one.

[Playground](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&code=%23%5Ballow(dead_code)%5D%0Atype%20SendVec%3CT%3A%20Send%3E%20%3D%20Vec%3CT%3E%3B)

According to guidelines,
r? @steveklabnik
Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35

FCP completion: rust-lang#28796 (comment)
…crichton

Remove the incorrect warning from README.md

My problem was user error; thanks to @Zoxc for fixing me!

r? @alexcrichton
…t, r=varkor

Dont ICE on an attempt to use GAT without feature gate

Fix rust-lang#60654
…i-obk

Make eval_place iterate instead of recurse

r? @oli-obk
…-obk

improve debug-printing of scalars

* Prettier printing for `Pointer` and `Bits`.
* Don't print the `ScalarMaybeUndef(...)` around `Scalar`.

Before: `Immediate(ScalarMaybeUndef(Scalar(Ptr(Pointer { alloc_id: AllocId(3401), offset: Size { raw: 4 }, tag: Tagged(7723) }))))`
After: `Immediate(Scalar(AllocId(3401).0x4[<7723>]))`

Before: `Immediate(ScalarMaybeUndef(Scalar(Bits { size: 8, bits: 10 })))`
After: `Immediate(Scalar(0x000000000000000A))`

Before: `Immediate(ScalarMaybeUndef(Scalar(Bits { size: 1, bits: 1 })))`
After: `Immediate(Scalar(0x01))`

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

Centril commented May 24, 2019

@bors r+ rollup=never p=16

@bors
Copy link
Contributor

bors commented May 24, 2019

📌 Commit ca1784f 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 May 24, 2019
@bors
Copy link
Contributor

bors commented May 24, 2019

⌛ Testing commit ca1784f with merge db04f49673b03f99fc73bd54ca82cc0484d50657...

@bors
Copy link
Contributor

bors commented May 24, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-i586-gnu-i586-i686-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:55:34] test [ui] ui/rfc1445/match-forbidden-without-eq.rs ... ok
[00:55:34] test [ui] ui/rfc1598-generic-associated-types/construct_with_other_type.rs ... ok
[00:55:34] test [ui] ui/rfc1598-generic-associated-types/empty_generics.rs ... ok
[00:55:34] test [ui] ui/rfc1598-generic-associated-types/collections.rs ... ok
[00:55:34] test [ui] ui/rfc1598-generic-associated-types/gat-dont-ice-on-absent-feature.rs ... ok
[00:55:34] test [ui] ui/rfc1598-generic-associated-types/generic-associated-types-where.rs ... ok
[00:55:35] test [ui] ui/rfc1598-generic-associated-types/iterable.rs ... ok
[00:55:35] test [ui] ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.rs ... ok
[00:55:35] test [ui] ui/rfc1598-generic-associated-types/gat-incomplete-warning.rs ... ok
---
[00:56:09] failures:
[00:56:09] 
[00:56:09] ---- [ui] ui/consts/static_mut_containing_mut_ref3.rs stdout ----
[00:56:09] 
[00:56:09] error: Error: expected failure status (Some(1)) but received status Some(101).
[00:56:09] status: exit code: 101
[00:56:09] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/static_mut_containing_mut_ref3.rs" "-Zthreads=1" "--target=i586-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/static_mut_containing_mut_ref3" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/i586-unknown-linux-gnu/native/rust-test-helpers" "-Clinker=cc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/static_mut_containing_mut_ref3/auxiliary" "-A" "unused"
[00:56:09] ------------------------------------------
[00:56:09] 
[00:56:09] ------------------------------------------
[00:56:09] stderr:
[00:56:09] stderr:
[00:56:09] ------------------------------------------
[00:56:09] error: internal compiler error: src/librustc_mir/interpret/place.rs:604: eval_place_to_mplace called on ((FOO: (u8, u8)).0: u8)
[00:56:09] thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:637:9
[00:56:09] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[00:56:09] error: aborting due to previous error
[00:56:09] 
[00:56:09] 
[00:56:09] 
[00:56:09] note: the compiler unexpectedly panicked. this is a bug.
[00:56:09] 
[00:56:09] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[00:56:09] 
[00:56:09] note: rustc 1.36.0-nightly (db04f4967 2019-05-24) running on x86_64-unknown-linux-gnu
[00:56:09] 
[00:56:09] note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0 -C linker=cc
[00:56:09] 
[00:56:09] ------------------------------------------
[00:56:09] 
[00:56:09] 
---
[00:56:09] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:521:22
[00:56:09] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[00:56:09] 
[00:56:09] 
[00:56:09] 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/i586-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-i586-unknown-linux-gnu" "--mode" "ui" "--target" "i586-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "cc" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/i586-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "8.0.0-rust-1.36.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[00:56:09] 
[00:56:09] 
[00:56:09] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target i586-unknown-linux-gnu,i686-unknown-linux-musl
[00:56:09] Build completed unsuccessfully in 0:52:41
---
travis_time:end:17fca645:start=1558725691285299059,finish=1558725691301038352,duration=15739293
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:078b9e68
$ 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:0c233b89
travis_time:start:0c233b89
$ 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:09c0a455
$ 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)

@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 May 24, 2019
@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:2419ad04:start=1558721905312415977,finish=1558721991855280234,duration=86542864257
$ 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:07:39] ................................................................................................i... 500/5579
[01:07:43] .................................................................................................... 600/5579
[01:07:46] .................................................................................................... 700/5579
[01:07:51] .................................................................................................... 800/5579
[01:07:56] ...............................................................F.............i...............i...... 900/5579
[01:08:03] ..........iiiii..................................................................................... 1100/5579
[01:08:06] .................................................................................................... 1200/5579
[01:08:08] .................................................................................................... 1300/5579
[01:08:11] .................................................................................................... 1400/5579
---
[01:10:45] failures:
[01:10:45] 
[01:10:45] ---- [ui] ui/consts/static_mut_containing_mut_ref3.rs stdout ----
[01:10:45] 
[01:10:45] error: Error: expected failure status (Some(1)) but received status Some(101).
[01:10:45] status: exit code: 101
[01:10:45] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/static_mut_containing_mut_ref3.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/static_mut_containing_mut_ref3" "-Crpath" "-O" "-Cdebuginfo=0" "-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/ui/consts/static_mut_containing_mut_ref3/auxiliary" "-A" "unused"
[01:10:45] ------------------------------------------
[01:10:45] 
[01:10:45] ------------------------------------------
[01:10:45] stderr:
[01:10:45] stderr:
[01:10:45] ------------------------------------------
[01:10:45] error: internal compiler error: src/librustc_mir/interpret/place.rs:604: eval_place_to_mplace called on ((FOO: (u8, u8)).0: u8)
[01:10:45] thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:637:9
[01:10:45] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:10:45] error: aborting due to previous error
[01:10:45] 
[01:10:45] 
[01:10:45] 
[01:10:45] note: the compiler unexpectedly panicked. this is a bug.
[01:10:45] 
[01:10:45] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[01:10:45] 
[01:10:45] note: rustc 1.36.0-dev running on x86_64-unknown-linux-gnu
[01:10:45] 
[01:10:45] note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
[01:10:45] 
[01:10:45] ------------------------------------------
[01:10:45] 
[01:10:45] 
---
[01:10:45] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:521:22
[01:10:45] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:10:45] 
[01:10:45] 
[01:10:45] 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 -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -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:10:45] 
[01:10:45] 
[01:10:45] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:10:45] Build completed unsuccessfully in 0:04:37
[01:10:45] Build completed unsuccessfully in 0:04:37
[01:10:45] make: *** [check] Error 1
[01:10:45] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:03751fa1
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Fri May 24 19:30:46 UTC 2019
---
travis_time:end:1628c277:start=1558726247783962209,finish=1558726247791563142,duration=7600933
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:027112fe
$ 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:2261d8d0
$ 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)

@oli-obk
Copy link
Contributor

oli-obk commented May 24, 2019

The next three PRs the top of the queue can't be in a rollup, not starting a new rollup

@oli-obk oli-obk closed this May 24, 2019
@Centril Centril deleted the rollup-nb733r3 branch May 25, 2019 02:46
@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.