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 13 pull requests #61128

Closed
wants to merge 30 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
"".
…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
…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.
…, r=oli-obk

Make eval_place_to_op 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
@Centril
Copy link
Contributor Author

Centril commented May 24, 2019

@bors r+ rollup=never p=13

@bors
Copy link
Contributor

bors commented May 24, 2019

📌 Commit 1972162 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 1972162 with merge 9bbf513...

bors added a commit that referenced this pull request May 24, 2019
Rollup of 13 pull requests

Successful merges:

 - #61077 (Don't arena-allocate static symbols.)
 - #61094 (Make find_local iterate instead of recurse)
 - #61095 (Update cargo)
 - #61096 (tidy: don't short-circuit on license error)
 - #61103 (Make find iterate instead of recurse)
 - #61104 (Make eval_place_to_op iterate instead of recurse)
 - #61107 (Fix a couple docs typos)
 - #61110 (Revert edition-guide toolstate override)
 - #61111 (Fixed type-alias-bounds lint doc)
 - #61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35)
 - #61116 (Remove the incorrect warning from README.md)
 - #61118 (Dont ICE on an attempt to use GAT without feature gate)
 - #61125 (Updated my mailmap entry)

Failed merges:

r? @ghost
@pietroalbini
Copy link
Member

@bors r- retry

Nothing wrong with the PR, I just need to configure a thing on the Azure side.

@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 May 24, 2019
@pietroalbini
Copy link
Member

@bors r=Centril

@bors
Copy link
Contributor

bors commented May 24, 2019

📌 Commit 1972162 has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2019
@bors
Copy link
Contributor

bors commented May 24, 2019

⌛ Testing commit 1972162 with merge 59bdb00ed6112c096fd3e8573a588fd806ab9516...

@oli-obk
Copy link
Contributor

oli-obk commented May 24, 2019

#61104 failed on travis

@bors r-

@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 May 24, 2019
@Centril
Copy link
Contributor Author

Centril commented May 24, 2019

@bors retry ^--

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 24, 2019
@Centril Centril closed this May 24, 2019
@Centril Centril deleted the rollup-rwjauqz branch May 24, 2019 18:15
@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:0c29258a:start=1558719374888267524,finish=1558719462301571650,duration=87413304126
$ 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:59] .................................................................................................... 2700/5579
[01:12:04] .................................................................................................... 2800/5579
[01:12:07] .................................................................................................... 2900/5579
[01:12:11] .................................................................................................... 3000/5579
[01:12:14] .....................F.............................................................................. 3100/5579
[01:12:22] .................................................................................................... 3300/5579
[01:12:25] ...........i........................................................................................ 3400/5579
[01:12:28] .....................................................................................ii...i..ii..... 3500/5579
[01:12:32] .................................................................................................... 3600/5579
---
[01:13:48] failures:
[01:13:48] 
[01:13:48] ---- [ui] ui/issues/issue-6991.rs stdout ----
[01:13:48] 
[01:13:48] error: test compilation failed although it shouldn't!
[01:13:48] status: exit code: 101
[01:13:48] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-6991.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/issues/issue-6991" "-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/issues/issue-6991/auxiliary" "-A" "unused"
[01:13:48] ------------------------------------------
[01:13:48] 
[01:13:48] ------------------------------------------
[01:13:48] stderr:
[01:13:48] stderr:
[01:13:48] ------------------------------------------
[01:13:48] error: internal compiler error: src/librustc_mir/interpret/place.rs:604: eval_place_to_mplace called on (*(x: &usize))
[01:13:48] thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:637:9
[01:13:48] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:13:48] error: aborting due to previous error
[01:13:48] 
[01:13:48] 
[01:13:48] 
[01:13:48] note: the compiler unexpectedly panicked. this is a bug.
[01:13:48] 
[01:13:48] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[01:13:48] 
[01:13:48] note: rustc 1.36.0-dev running on x86_64-unknown-linux-gnu
[01:13:48] 
[01:13:48] note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
[01:13:48] 
[01:13:48] ------------------------------------------
[01:13:48] 
[01:13:48] 
---
[01:13:48] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:521:22
[01:13:48] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:13:48] 
[01:13:48] 
[01:13:48] 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:13:48] 
[01:13:48] 
[01:13:48] 
[01:13:48] make: *** [check] Error 1
[01:13:48] Build completed unsuccessfully in 0:04:35
[01:13:48] Makefile:48: recipe for target 'check' failed
travis_time:end:3586747a:start=1558719471535903157,finish=1558723900183850082,duration=4428647946925
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.

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.