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 7 pull requests #60434

Closed
wants to merge 23 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 1, 2019

Successful merges:

Failed merges:

r? @ghost

matthewjasper and others added 23 commits April 26, 2019 22:14
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.
…-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
…, r=estebank

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

Fixes rust-lang#47213.
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)
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
…ackler

Implement `BorrowMut<str>` for `String`

Closes rust-lang/rfcs#1282.
…-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
Copy link
Contributor Author

Centril commented May 1, 2019

@bors r+ p=7

@bors
Copy link
Contributor

bors commented May 1, 2019

📌 Commit 9fe04ef 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
Contributor

bors commented May 1, 2019

⌛ Testing commit 9fe04ef with merge 4ac434e...

bors added a commit that referenced this pull request May 1, 2019
Rollup of 7 pull requests

Successful merges:

 - #60327 (Search for incompatible universes in borrow errors)
 - #60330 (Suggest using an inclusive range instead of an exclusive range when the endpoint overflows by 1)
 - #60366 (build-gcc: Create missing cc symlink)
 - #60369 (Support ZSTs in DispatchFromDyn)
 - #60404 (Implement `BorrowMut<str>` for `String`)
 - #60417 (Rename hir::ExprKind::Use to ::DropTemps and improve docs.)
 - #60432 (Update clippy)

Failed merges:

r? @ghost
@Centril
Copy link
Contributor Author

Centril commented May 1, 2019

@bors r- retry

Booting #60432 due to #60433 (comment).

@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-x1iczrh branch May 1, 2019 06:31
@rust-highfive
Copy link
Collaborator

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:07d8ad88:start=1556691192000051083,finish=1556691263793005666,duration=71792954583
$ 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:22:24] 
[01:22:24] failures:
[01:22:24] 
[01:22:24] ---- /checkout/src/doc/edition-guide/src/rust-2018/data-types/inclusive-ranges.md - ___ (line 28) stdout ----
[01:22:24] 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:22:24] 
[01:22:24] 
[01:22:24] failures:
[01:22:24]     /checkout/src/doc/edition-guide/src/rust-2018/data-types/inclusive-ranges.md - ___ (line 28)
---
[01:28:05] 
[01:28:06] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:28:06]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:25
[01:28:06]     |
[01:28:06] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:28:06] 
[01:28:06] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:28:06]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:49
[01:28:06]     |
[01:28:06]     |
[01:28:06] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:28:06] 
[01:28:06] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:28:06]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:610:23
[01:28:06]     |
---
[01:28:06] 
[01:28:07] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:28:07]    --> src/tools/clippy/clippy_lints/src/loops.rs:680:21
[01:28:07]     |
[01:28:07] 680 |         | ExprKind::Use(ref e) => never_loop_expr(e, main_loop_id),
[01:28:07] 
[01:28:08] error: aborting due to 8 previous errors
[01:28:08] 
[01:28:08] For more information about this error, try `rustc --explain E0599`.
---
[01:28:09] 
[01:28:10] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:28:10]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:25
[01:28:10]     |
[01:28:10] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:28:10] 
[01:28:10] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:28:10]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:49
[01:28:10]     |
[01:28:10]     |
[01:28:10] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:28:10] 
[01:28:10] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:28:10]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:610:23
[01:28:10]     |
---
[01:28:10] 
[01:28:11] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:28:11]    --> src/tools/clippy/clippy_lints/src/loops.rs:680:21
[01:28:11]     |
[01:28:11] 680 |         | ExprKind::Use(ref e) => never_loop_expr(e, main_loop_id),
[01:28:11] 
[01:28:12] error: aborting due to 8 previous errors
[01:28:12] 
[01:28:12] For more information about this error, try `rustc --explain E0599`.
---
[01:32:04]    Compiling opener v0.3.2
[01:32:04] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:32:04]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:25
[01:32:04]     |
[01:32:04] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:32:04] 
[01:32:04] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:32:04]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:159:49
[01:32:04]     |
[01:32:04]     |
[01:32:04] 159 |             (&ExprKind::Use(ref le), &ExprKind::Use(ref re)) => self.eq_expr(le, re),
[01:32:04] 
[01:32:04] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:32:04]    --> src/tools/clippy/clippy_lints/src/utils/hir_utils.rs:610:23
[01:32:04]     |
---
[01:32:05] 
[01:32:06] error[E0599]: no variant or associated item named `Use` found for type `rustc::hir::ExprKind` in the current scope
[01:32:06]    --> src/tools/clippy/clippy_lints/src/loops.rs:680:21
[01:32:06]     |
[01:32:06] 680 |         | ExprKind::Use(ref e) => never_loop_expr(e, main_loop_id),
[01:32:06] 
[01:32:07]    Compiling rls-analysis v0.17.0
[01:32:09] error: aborting due to 8 previous errors
[01:32:09] 
---
[01:43:04] +
[01:43:04] +
[01:43:04] 
[01:43:04] The actual stderr differed from the expected stderr.
[01:43:04] Actual stderr saved to /tmp/compiletestVHWMBC/async-fn.stderr
[01:43:04] To update references, run this command from build directory:
[01:43:04] tests/run-pass/update-references.sh '/tmp/compiletestVHWMBC' 'async-fn.rs'
[01:43:04] error: 1 errors occurred comparing output.
[01:43:04] status: exit code: 1
[01:43:04] status: exit code: 1
[01:43:04] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/async-fn.rs" "-L" "/tmp/compiletestVHWMBC" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestVHWMBC/async-fn.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "-L" "/tmp/compiletestVHWMBC/async-fn.stage-id.aux" "-A" "unused"
[01:43:04] ------------------------------------------
[01:43:04] 
[01:43:04] ------------------------------------------
[01:43:04] stderr:
---
[01:43:09] +For more information about this error, try `rustc --explain E0080`.
[01:43:09] +
[01:43:09] 
[01:43:09] The actual stderr differed from the expected stderr.
[01:43:09] Actual stderr saved to /tmp/compiletestVHWMBC/hashmap.stderr
[01:43:09] To update references, run this command from build directory:
[01:43:09] tests/run-pass/update-references.sh '/tmp/compiletestVHWMBC' 'hashmap.rs'
[01:43:09] error: 1 errors occurred comparing output.
[01:43:09] status: exit code: 1
[01:43:09] status: exit code: 1
[01:43:09] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/hashmap.rs" "-L" "/tmp/compiletestVHWMBC" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestVHWMBC/hashmap.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "-Zmiri-seed=0000000000000000" "-L" "/tmp/compiletestVHWMBC/hashmap.stage-id.aux" "-A" "unused"
[01:43:09] ------------------------------------------
[01:43:09] 
[01:43:09] ------------------------------------------
[01:43:09] stderr:
---
[01:43:20] Verifying status of rustfmt...
[01:43:20] Verifying status of clippy-driver...
[01:43:20] This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
[01:43:20] 
[01:43:20] ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
[01:43:20] 
[01:43:20] If you do intend to update 'clippy-driver', please check the error messages above and
[01:43:20] commit another update.
[01:43:20] 
[01:43:20] If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
[01:43:20] change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
[01:43:20] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:244ddb16
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed May  1 07:57:53 UTC 2019

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-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.

9 participants