Skip to content

Rollup of 6 pull requests - #60328

Closed
Centril wants to merge 14 commits into
rust-lang:masterfrom
Centril:rollup-527pfq1
Closed

Rollup of 6 pull requests#60328
Centril wants to merge 14 commits into
rust-lang:masterfrom
Centril:rollup-527pfq1

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

emilyalbiniand others added 14 commits April 26, 2019 16:52
Replace the `&'tcx List<Ty<'tcx>>` in `TyKind::Tuple` with `SubstsRef<'tcx>`
Part of the suggested refactoring for rust-lang#42340. As expected, this is a little messy, because there are many places that the components of tuples are expected to be types, rather than arbitrary kinds. However, it should open up the way for a refactoring of `TyS` itself.
r? @nikomatsakis
Make "Implementations on Foreign Types" items in sidebar link to specific impls
This solves rust-lang#56018 for most cases (though not work for foreign impls with same names)
…troalbini
Add 1.34.1 release notes
This is a backport of the release notes from the 1.34.1 release.
r? @ghost
…ark-Simulacrum
bootstrap: use correct version numbers for llvm-tools and lldb
The current URLs for the `llvm-tools` and `lldb` components are a bit broken right now:
```
https://static.rust-lang.org/dist/2019-04-25/llvm-tools-1.34.1 (fc50f32 2019-04-24)-aarch64-unknown-linux-gnu.tar.gz
```
This PR uses proper version numbers for those. Tested a dist build locally and everything works.
r? @Mark-Simulacrum
…=joshtriplett
Use "capacity" as parameter name in with_capacity() methods
See rust-lang#60271.
The only place where I didn't change the parameter name is `RawVec`. The problem is that it has a `.cap()` method instead of the usual `.capacity()`:
https://github.com/rust-lang/rust/blob/597f432489f12a3f33419daa039ccef11a12c4fd/src/liballoc/raw_vec.rs#L200-L210
Changing this would be a breaking change, and I guess that's not worth it.
But since I didn't change `.cap()` there, I didn't change the `cap` parameter name to `capacity`, either.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=6

@bors

bors commented Apr 27, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 2d04393 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 27, 2019
@bors

bors commented Apr 27, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2d04393 with merge 02881d9739da1a5d3ac1515ff62874f05fe67288...

@bors

bors commented Apr 27, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@borsbors 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 Apr 27, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

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:22] Status: Downloaded newer image for ubuntu:18.04
[00:01:22] ---> eb780ea9cf9e
[00:01:22] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:33] ---> Running in 04aba428576a
[00:01:34] standard_init_linux.go:190: exec user process caused "exec format error"
[00:01:34] The command '/bin/sh -c apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config' returned a non-zero code: 1
[00:01:35] Sending build context to Docker daemon 520.7kB
[00:01:35] Step 1/10 : FROM ubuntu:18.04
[00:01:35] ---> eb780ea9cf9e
[00:01:35] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:35] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:35] ---> Running in 9751e7028309
[00:01:36] standard_init_linux.go:190: exec user process caused "exec format error"
[00:01:36] The command '/bin/sh -c apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config' returned a non-zero code: 1
[00:01:38] Sending build context to Docker daemon 520.7kB
[00:01:38] Step 1/10 : FROM ubuntu:18.04
[00:01:38] ---> eb780ea9cf9e
[00:01:38] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:38] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:38] ---> Running in fe353080ff30
[00:01:39] standard_init_linux.go:190: exec user process caused "exec format error"
[00:01:39] The command '/bin/sh -c apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config' returned a non-zero code: 1
[00:01:42] Sending build context to Docker daemon 520.7kB
[00:01:42] Step 1/10 : FROM ubuntu:18.04
[00:01:42] ---> eb780ea9cf9e
[00:01:42] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:42] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:42] ---> Running in ea698d382b11
[00:01:43] standard_init_linux.go:190: exec user process caused "exec format error"
[00:01:43] The command '/bin/sh -c apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config' returned a non-zero code: 1
[00:01:47] Sending build context to Docker daemon 520.7kB
[00:01:47] Step 1/10 : FROM ubuntu:18.04
[00:01:47] ---> eb780ea9cf9e
[00:01:47] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:47] Step 2/10 : RUN apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config
[00:01:47] ---> Running in 9727439223ca
[00:01:48] standard_init_linux.go:190: exec user process caused "exec format error"
[00:01:48] The command '/bin/sh -c apt-get update && apt-get install -y --no-install-recommends clang make file curl ca-certificates python2.7 git cmake sudo bzip2 xz-utils wget libssl-dev pkg-config' returned a non-zero code: 1
travis_time:end:0122438c:start=1556366839822472916,finish=1556366948350177214,duration=108527704298
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 1.
travis_time:start:263e0803
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:015b43b0:start=1556366949137144103,finish=1556366949144083876,duration=6939773
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2784e6dc
$ 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:022872df
travis_time:start:022872df
$ 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:0bd16470
$ 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)

@CentrilCentril closed this Apr 27, 2019
@Centril
Centril deleted the rollup-527pfq1 branch April 27, 2019 12:12
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Centril@bors@rust-highfive@emilyalbini@cuviper@mgeier@dima74@varkor