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 #60435

Merged
merged 23 commits into from
May 1, 2019
Merged

Rollup of 7 pull requests #60435

merged 23 commits into from
May 1, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 1, 2019

Successful merges:

Failed merges:

r? @ghost

Zoxc and others added 23 commits April 25, 2019 22:29
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=8

@bors
Copy link
Contributor

bors commented May 1, 2019

📌 Commit e5b6997 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 e5b6997 with merge fa13ddbdde52a64e4b5a7be039a933546c15f976...

@bors
Copy link
Contributor

bors commented May 1, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-i686-linux 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:01:21] 
[00:01:21] Total download size: 4.9 M
[00:01:21] Downloading Packages:
[00:01:21] --------------------------------------------------------------------------------
[00:01:21] Total                                           9.8 MB/s | 4.9 MB     00:00     
[00:01:21] warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID e8562897
[00:01:21] Importing GPG key 0xE8562897 "CentOS-5 Key (CentOS 5 Official Signing Key) <centos-5-key@centos.org>" from /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
[00:01:22] Running Transaction Test
[00:01:22] Finished Transaction Test
[00:01:22] Transaction Test Succeeded
[00:01:22] Running Transaction
---
[00:03:17] + hide_output make install
[00:03:17] + set +x
[00:03:38] shared.sh: line 1:   352 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:03:38] + cd ..
[00:03:38] + rm -rf openssl-1.0.2k
[00:03:38] ./build-openssl.sh: line 16:  4115 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"  (wd: /tmp/openssl-1.0.2k)
[00:03:38] + ln -nsf /etc/pki/tls/cert.pem /rustroot/ssl/
[00:03:39]  ---> 6cc8e1ef90b8
[00:03:39] Step 14/41 : COPY dist-x86_64-linux/build-curl.sh /tmp/
[00:03:39]  ---> f496c7f8ded4
[00:03:39] Step 15/41 : RUN ./build-curl.sh
[00:03:39] Step 15/41 : RUN ./build-curl.sh
[00:03:39]  ---> Running in 570f74f54e89
[00:03:39] + source shared.sh
[00:03:39] + VERSION=7.51.0
[00:03:39] + curl http://cool.haxx.se/download/curl-7.51.0.tar.bz2
[00:03:41]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[00:03:41]                                  Dload  Upload   Total   Spent    Left  Speed
[00:03:42] 
  0 2509k    0 14215    0     0   9373      0  0:04:34  0:00:01  0:04:33  9373
  0 2509k    0 14215    0     0   9373      0  0:04:34  0:00:01  0:04:33  9373
  1 2509k    1 30599    0     0  18656      0  0:02:17  0:00:01  0:02:16  129k
 82 2509k   82 2060k    0     0   785k      0  0:00:03  0:00:02  0:00:01 1845k
100 2509k  100 2509k    0     0   913k      0  0:00:02  0:00:02 --:--:-- 2024k
[00:03:42] + mkdir curl-build
[00:03:42] + cd curl-build
[00:03:42] + hide_output ../curl-7.51.0/configure --prefix=/rustroot --with-ssl=/rustroot --disable-sspi --disable-gopher --disable-smtp --disable-smb --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-manual --disable-dict --disable-rtsp --disable-ldaps --disable-ldap
[00:04:06] + hide_output make -j10
[00:04:06] + set +x
[00:04:18] shared.sh: line 1:    13 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:04:18] + hide_output make install
---
 87 67.8M   87 59.6M    0     0  7125k      0  0:00:09  0:00:08  0:00:01 7534k
 99 67.8M   99 67.6M    0     0  7241k      0  0:00:09  0:00:09 --:--:-- 7655k
100 67.8M  100 67.8M    0     0  7243k      0  0:00:09  0:00:09 --:--:-- 8383k
[00:07:57] + cd gcc-5.5.0
[00:07:57] + sed -i 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
[00:07:57] --2019-05-01 06:41:24--  http://gcc.gnu.org/pub/gcc/infrastructure/mpfr-2.4.2.tar.bz2
[00:07:57] Resolving gcc.gnu.org... 209.132.180.131
[00:07:57] Connecting to gcc.gnu.org|209.132.180.131|:80... connected.
[00:07:57] HTTP request sent, awaiting response... 200 OK
---
[01:16:09]  ---> 7da2129aa363
[01:16:09] Step 25/41 : RUN ./build-clang.sh
[01:16:09]  ---> Running in 296a1a7a3dbe
[01:16:10] + source shared.sh
[01:16:10] + LLVM=llvmorg-8.0.0-rc2
[01:16:10] + cd llvm-project
[01:16:10] + cd llvm-project
[01:16:10] + curl -L https://github.com/llvm/llvm-project/archive/llvmorg-8.0.0-rc2.tar.gz
[01:16:10] + tar xzf - --strip-components=1
[01:16:10]                                  Dload  Upload   Total   Spent    Left  Speed
[01:16:10] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   136    0   136    0     0    539      0 --:--:-- --:--:-- --:--:--   612
---
[01:16:29] + cd clang-build
[01:16:29] + INC=/rustroot/include
[01:16:29] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed
[01:16:29] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed:/usr/include
[01:16:29] + hide_output cmake ../llvm -DCMAKE_C_COMPILER=/rustroot/bin/gcc -DCMAKE_CXX_COMPILER=/rustroot/bin/g++ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/rustroot -DLLVM_TARGETS_TO_BUILD=X86 '-DLLVM_ENABLE_PROJECTS=clang;lld' -DC_INCLUDE_DIRS=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed:/usr/include
[01:16:59] Wed May 1 07:50:26 UTC 2019 - building ...
[01:17:09] + hide_output make -j10
[01:17:09] + set +x
[01:17:39] Wed May 1 07:51:07 UTC 2019 - building ...
---
[02:44:54]  ---> 88e39b00251d
[02:44:54] Step 32/41 : RUN ./build-perl.sh
[02:44:54]  ---> Running in 90fee55f6b09
[02:44:55] + source shared.sh
[02:44:55] + curl https://www.cpan.org/src/5.0/perl-5.28.0.tar.gz
[02:44:55]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[02:44:55]                                  Dload  Upload   Total   Spent    Left  Speed
[02:44:56] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
---
[02:57:30]    Compiling rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[02:57:39] [RUSTC-TIMING] rustc_errors test:false 8.057
[02:58:49] [RUSTC-TIMING] syntax test:false 70.480
[02:58:49]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
The job exceeded the maximum time limit for jobs, and has been terminated.

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)

@pietroalbini
Copy link
Member

@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-review Status: Awaiting review from the assignee but also interested parties. labels May 1, 2019
@bors
Copy link
Contributor

bors commented May 1, 2019

⌛ Testing commit e5b6997 with merge 169da6f8277abc1f84411e5fbeee3e8cc380bcff...

@bors
Copy link
Contributor

bors commented May 1, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-aux 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.
[02:03:19] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/cargotest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build/ct"
[02:03:19] expected success, got: exit code: 101
[02:03:19] 
[02:03:19] 
[02:03:19] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/run-pass/pretty src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/test/run-pass-fulldeps/pretty src/tools/cargo src/tools/cargotest
[02:03:19] Build completed unsuccessfully in 0:34:11
[02:03:19] make: *** [check-aux] Error 1
[02:03:19] Makefile:50: recipe for target 'check-aux' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:04e49e9a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed May  1 17:15:03 UTC 2019
---
travis_time:end:0c596436:start=1556730907331708963,finish=1556730907353294848,duration=21585885
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0fa265d0
$ 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:start:crashlog
obj/cores/core.5602.!checkout!obj!build!x86_64-unknown-linux-gnu!stage2!bin!rustc
[New LWP 5604]
[New LWP 5602]
warning: Could not load shared library symbols for 8 libraries, e.g. /lib/x86_64-linux-gnu/libc.so.6.
Use the "info sharedlibrary" command to see the complete listing.
Do you need "set solib-search-path" or "set sysroot"?
Core was generated by `rustc --crate-name foo src/lib.rs --color never --crate-type lib --emit=dep-inf'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007f99fc530428 in ?? ()
[Current thread is 1 (LWP 5604)]
#0  0x00007f99fc530428 in ?? ()
#1  0x00007f99fc53202a in ?? ()
#2  0x0000000000000020 in ?? ()
#3  0x0000000000000000 in ?? ()
travis_time:end:0fa265d0:start=1556730907359375519,finish=1556730909185556053,duration=1826180534
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:08cbc9f8
travis_time:start:08cbc9f8
$ 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:0be8b1d2
$ 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 1, 2019
@tesuji
Copy link
Contributor

tesuji commented May 1, 2019

spurious network error?

@Centril
Copy link
Contributor Author

Centril commented May 1, 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-review Status: Awaiting review from the assignee but also interested parties. labels May 1, 2019
@bors
Copy link
Contributor

bors commented May 1, 2019

⌛ Testing commit e5b6997 with merge 9b67bd4...

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

Successful merges:

 - #60287 (Use references for variances_of)
 - #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.)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 1, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 9b67bd4 to master...

@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #60435!

Tested on commit 9b67bd4.
Direct link to PR: #60435

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).
💔 edition-guide on windows: test-pass → test-fail (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).
💔 edition-guide on linux: test-pass → test-fail (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 1, 2019
Tested on commit rust-lang/rust@9b67bd4.
Direct link to PR: <rust-lang/rust#60435>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).
💔 edition-guide on windows: test-pass → test-fail (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).
💔 edition-guide on linux: test-pass → test-fail (cc @ehuss @Centril @steveklabnik, @rust-lang/infra).
@Centril Centril deleted the rollup-aa5lmuw branch May 1, 2019 20:10
@Centril
Copy link
Contributor Author

Centril commented May 1, 2019

@ehuss Can you take a look at the edition guide test failure perhaps?

@ehuss
Copy link
Contributor

ehuss commented May 1, 2019

@Centril @varkor I don't fully understand #60330. The following example:

fn takes_u8(x: u8) {
    // ...
}

fn main() {
    for i in 0..256 {
        println!("i: {}", i);
        takes_u8(i);
    }
}

Previously it was an error (literal out of range). On latest master, it builds, but produces no output. Removing the call to takes_u8 prints [0, 255]. Why does calling that function cause nothing to happen? Is there some silent overflow?

@varkor
Copy link
Member

varkor commented May 1, 2019

@ehuss: that shouldn't build. It should produce the same error as before, but with an additional instruction. I'll investigate.

Why does calling that function cause nothing to happen?

Because without specifying that the integer is u8, it's defaulting to u32, which doesn't overflow.

@varkor
Copy link
Member

varkor commented May 1, 2019

I've opened up #60459 specifically for this issue. Thanks for spotting it.

@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.