Skip to content

Rollup of 8 pull requests#60433

Closed
Centril wants to merge 26 commits intorust-lang:masterfrom
Centril:rollup-l534wjc
Closed

Rollup of 8 pull requests#60433
Centril wants to merge 26 commits intorust-lang:masterfrom
Centril:rollup-l534wjc

Conversation

@Centril
Copy link
Contributor

@Centril Centril commented May 1, 2019

Successful merges:

Failed merges:

r? @ghost

varkor and others added 26 commits April 25, 2019 20:16
@varkor
Fix indexing issue for const parameter invariance
f024196
@Zoxc
Update variances_of
d2ff829
@matthewjasper
Search for incompatible universes in borrow errors
a962274 
If we have a borrow that has to live for `'static` we need to check for
any regions in incompatible universes when trying to find the cause.
@TimDiekmann
Support ZSTs in DispatchFromDyn
abf73a6
@tesuji
build-gcc: Create missing cc symlink
484b304
@lo48576
Implement BorrowMut<str> for String
a0e112b 
Closes rust-lang/rfcs#1282.
@TimDiekmann
Only allow ZSTs with 1 byte alignment
1b679e7
@Centril
Rename hir::ExprKind::Use to ::DropTemps and improve docs.
d58cb93
@varkor
Pull is_range_literal out into lowering
2cefd99
@varkor
Suggest using an inclusive range for an overflowing endpoint
5ec2f5e
@varkor
Add a test for overflowing endpoints
c5fdff2
@varkor
Place types inside backticks
218982b
@varkor
Preserve literal suffixes
0556e48
@varkor
Include signed integer types in the lint
13962af
@varkor
Refactor is_range_literal
5e709b2
@varkor
Pull out some functors for readability
80f90d8
@varkor
Rename is_range_literal to is_lit
b7711bf
@Manishearth
Update clippy
3092ac5
@Centril
Rollup merge of rust-lang#60287 - Zoxc:the-arena-variances_of, r=eddyb
535fdfc 
Use references for variances_of

Based on rust-lang#60280.

cc @varkor
r? @eddyb
@Centril
Rollup merge of rust-lang#60327 - matthewjasper:handle-local-outlives…
24da0e5 
…-lbl, r=nikomatsakis

Search for incompatible universes in borrow errors

If we have a borrow that has to live for `'static` we need to check for
any regions in incompatible universes when trying to find the cause.

closes rust-lang#60274
@Centril
Rollup merge of rust-lang#60330 - varkor:range-endpoint-overflow-lint…
af2d3f0 
…, r=estebank

Suggest using an inclusive range instead of an exclusive range when the endpoint overflows by 1

Fixes rust-lang#47213.
@Centril
Rollup merge of rust-lang#60366 - lzutao:patch-1, r=pietroalbini
15e57b8 
build-gcc: Create missing cc symlink

This PR mostly fixes build error caused by using rustc docker images
to build [rustup][1] (with the error: ``linker `cc` not found``).

I don't know why gcc build script doesn't install cc hard link by default.
In build log, with `make SHELL='sh -x' install`, gcc build script installs c++
hard link but not `cc` one:

```bash
if test "" != "yes" ; then \
  rm -f /rustroot/bin/g++; \
  /usr/bin/install -c xg++ /rustroot/bin/g++; \
  chmod a+x /rustroot/bin/g++; \
  rm -f /rustroot/bin/c++; \
  ( cd /rustroot/bin && \
    ln g++ c++ ); \
  if [ -f cc1plus ] ; then \
    if [ ! -f g++-cross ] ; then \
      rm -f /rustroot/bin/x86_64-unknown-linux-gnu-g++; \
      ( cd /rustroot/bin && \
        ln g++ x86_64-unknown-linux-gnu-g++ ); \
      rm -f /rustroot/bin/x86_64-unknown-linux-gnu-c++; \
      ( cd /rustroot/bin && \
        ln c++ x86_64-unknown-linux-gnu-c++ ); \
    fi ; \
  fi; \
fi
```

This might be fixed downstream by manually creating cc hard link
or setting `RUSTFLAGS="-C linker=gcc"` as [suggested by @mati865][2].
But I find it better to fix it upstream in this PR.

[1]: rust-lang/rustup#1815
[2]: rust-lang/rustup#1815 (comment)
@Centril
Rollup merge of rust-lang#60369 - TimDiekmann:dispatch-zst, r=eddyb
80da5a5 
Support ZSTs in DispatchFromDyn

Allows to use ZSTs with 1 byte alignment in `DispatchFromDyn` implementation. This is required for `Box<T, A: Alloc>`

cc rust-lang#58457
@Centril
Rollup merge of rust-lang#60404 - lo48576:borrow-mut-for-string, r=sf…
a31ec19 
…ackler

Implement `BorrowMut<str>` for `String`

Closes rust-lang/rfcs#1282.
@Centril
Rollup merge of rust-lang#60417 - Centril:hir-exprkind-use-renamed-to…
ef7068a 
…-drop-temps, r=oli-obk

Rename hir::ExprKind::Use to ::DropTemps and improve docs.

Addresses rust-lang#60225 (comment).

r? @oli-obk

cc @eddyb @Manishearth
@Centril
Rollup merge of rust-lang#60432 - Manishearth:clippyup, r=Manishearth
5a7755b 
Update clippy

r? @ghost
@Centril
Copy link
Contributor Author

Centril commented May 1, 2019

@borsr r+ p=8

@bors
Copy link
Collaborator

bors commented May 1, 2019

📌 Commit 5a7755b 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 1, 2019
@bors
Copy link
Collaborator

bors commented May 1, 2019

⌛ Testing commit 5a7755b with merge 3accd45ce2a2a5b763b4d691ddd91854cfabf755...

@tesuji
Copy link
Contributor

tesuji commented May 1, 2019

@Centril Conflict in #60287

@Centril
Copy link
Contributor Author

Centril commented May 1, 2019

Sigh... why isn't bors killing the PR? cc @kennytm

@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 May 1, 2019
@Centril Centril closed this May 1, 2019
@Centril Centril deleted the rollup-l534wjc branch May 1, 2019 06:10
@bors
Copy link
Collaborator

bors commented May 1, 2019

☔ The latest upstream changes (presumably #60280) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-highfive
Copy link
Contributor

rust-highfive commented May 1, 2019

The job x86_64-gnu-tools 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:196c055a:start=1556684851190764492,finish=1556684937113808972,duration=85923044480
$ 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:17:16] 
[01:17:16] failures:
[01:17:16] 
[01:17:16] ---- /checkout/src/doc/edition-guide/src/rust-2018/data-types/inclusive-ranges.md - ___ (line 28) stdout ----
[01:17:16] thread '/checkout/src/doc/edition-guide/src/rust-2018/data-types/inclusive-ranges.md - ___ (line 28)' panicked at 'test compiled while it wasn't supposed to', src/librustdoc/test.rs:300:13
[01:17:16] 
[01:17:16] 
[01:17:16] failures:
[01:17:16]     /checkout/src/doc/edition-guide/src/rust-2018/data-types/inclusive-ranges.md - ___ (line 28)
---
[01:22:25] 
[01:22:25] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:22:25]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:25
[01:22:25]     |
[01:22:25] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:22:25] 
[01:22:25] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:22:25]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:49
[01:22:25]     |
[01:22:25]     |
[01:22:25] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:22:25] 
[01:22:25] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:22:25]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:610:23
[01:22:25]     |
---
[01:22:25] 
[01:22:26] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:22:26]    --> src/tools/clippy/clippy_lints/src/loops.rs:680:21
[01:22:26]     |
[01:22:26] 680 |         | ExprKind::Use(ref e) => never_loop_expr(e, main_loop_id),
[01:22:26] 
[01:22:28] error: aborting due to 8 previous errors
[01:22:28] 
[01:22:28] For more information about this error, try `rustc --explain E0599`.
---
[01:22:31] 
[01:22:31] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:22:31]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:25
[01:22:31]     |
[01:22:31] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:22:31] 
[01:22:31] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:22:31]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:49
[01:22:31]     |
[01:22:31]     |
[01:22:31] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:22:31] 
[01:22:31] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:22:31]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:610:23
[01:22:31]     |
---
[01:22:32] 
[01:22:32] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:22:32]    --> src/tools/clippy/clippy_lints/src/loops.rs:680:21
[01:22:32]     |
[01:22:32] 680 |         | ExprKind::Use(ref e) => never_loop_expr(e, main_loop_id),
[01:22:32] 
[01:22:34] error: aborting due to 8 previous errors
[01:22:34] 
[01:22:34] For more information about this error, try `rustc --explain E0599`.
---
[01:25:54] 
[01:25:54] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:25:54]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:25
[01:25:54]     |
[01:25:54] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:25:54] 
[01:25:54] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:25:54]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:49
[01:25:54]     |
[01:25:54]     |
[01:25:54] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:25:54] 
[01:25:54] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:25:54]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:610:23
[01:25:54]     |
---
[01:25:55]    Compiling rls-analysis v0.17.0
[01:25:56] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:25:56]    --> src/tools/clippy/clippy_lints/src/loops.rs:680:21
[01:25:56]     |
[01:25:56] 680 |         | ExprKind::Use(ref e) => never_loop_expr(e, main_loop_id),
[01:25:56] 
[01:25:57]    Compiling rustfix v0.4.4
[01:25:58] error: aborting due to 8 previous errors
[01:25:58] 
---
[01:35:35] +
[01:35:35] +
[01:35:35] 
[01:35:35] The actual stderr differed from the expected stderr.
[01:35:35] Actual stderr saved to /tmp/compiletest42LOJ9/async-fn.stderr
[01:35:35] To update references, run this command from build directory:
[01:35:35] tests/run-pass/update-references.sh '/tmp/compiletest42LOJ9' 'async-fn.rs'
[01:35:35] error: 1 errors occurred comparing output.
[01:35:35] status: exit code: 1
[01:35:35] thread '[ui] run-pass/async-fn.rs' panicked at 'explicit panic', /cargo/registry/src/github.com-1ecc6299db9ec823/compiletest_rs-0.3.22/src/runtest.rs:2632:9
[01:35:35] thread '[ui] run-pass/async-fn.rs' panicked at 'explicit panic', /cargo/registry/src/github.com-1ecc6299db9ec823/compiletest_rs-0.3.22/src/runtest.rs:2632:9
[01:35:35] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/async-fn.rs" "-L" "/tmp/compiletest42LOJ9" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletest42LOJ9/async-fn.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "-L" "/tmp/compiletest42LOJ9/async-fn.stage-id.aux" "-A" "unused"
[01:35:35] stdout:
[01:35:35] ------------------------------------------
[01:35:35] 
[01:35:35] ------------------------------------------
---
[01:35:40] +For more information about this error, try `rustc --explain E0080`.
[01:35:40] +
[01:35:40] 
[01:35:40] The actual stderr differed from the expected stderr.
[01:35:40] Actual stderr saved to /tmp/compiletest42LOJ9/hashmap.stderr
[01:35:40] To update references, run this command from build directory:
[01:35:40] tests/run-pass/update-references.sh '/tmp/compiletest42LOJ9' 'hashmap.rs'
[01:35:40] error: 1 errors occurred comparing output.
[01:35:40] status: exit code: 1
[01:35:40] status: exit code: 1
[01:35:40] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/hashmap.rs" "-L" "/tmp/compiletest42LOJ9" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletest42LOJ9/hashmap.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "-Zmiri-seed=0000000000000000" "-L" "/tmp/compiletest42LOJ9/hashmap.stage-id.aux" "-A" "unused"
[01:35:40] ------------------------------------------
[01:35:40] 
[01:35:40] ------------------------------------------
[01:35:40] stderr:
---
[01:35:50] Verifying status of rustfmt...
[01:35:50] Verifying status of clippy-driver...
[01:35:50] This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
[01:35:50] 
[01:35:50] ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
[01:35:50] 
[01:35:50] If you do intend to update 'clippy-driver', please check the error messages above and
[01:35:50] commit another update.
[01:35:50] 
[01:35:50] If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
[01:35:50] change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
[01:35:50] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:2ffaf413
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed May  1 06:04:55 UTC 2019
---
travis_time:end:00fbec1c:start=1556690696978841275,finish=1556690696983476957,duration=4635682
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2f26608c
$ 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:0225dfad
travis_time:start:0225dfad
$ 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:373c9e5a
$ 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 mentioned this pull request May 1, 2019
Closed
@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

Reviewers

No reviews

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@Centril @bors @tesuji @rust-highfive @varkor @Zoxc @matthewjasper @TimDiekmann @lo48576 @Manishearth