Rollup of 5 pull requests by Centril · Pull Request #60329 · rust-lang/rust

Centril · 2019-04-27T12:12:44Z

Successful merges:

Replace the &'tcx List<Ty<'tcx>> in TyKind::Tuple with SubstsRef<'tcx> #60292 (Replace the &'tcx List<Ty<'tcx>> in TyKind::Tuple with SubstsRef<'tcx>)
Make "Implementations on Foreign Types" items in sidebar link to specific impls #60307 (Make "Implementations on Foreign Types" items in sidebar link to specific impls)
Add 1.34.1 release notes #60309 (Add 1.34.1 release notes)
bootstrap: use correct version numbers for llvm-tools and lldb #60315 (bootstrap: use correct version numbers for llvm-tools and lldb)
Use "capacity" as parameter name in with_capacity() methods #60316 (Use "capacity" as parameter name in with_capacity() methods)

Failed merges:

…ific impls

@nikomatsakis

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)

@ghost

…troalbini Add 1.34.1 release notes This is a backport of the release notes from the 1.34.1 release. r? @ghost

@Mark-Simulacrum

…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 · 2019-04-27T12:58:02Z

@bors r+ p=5

bors · 2019-04-27T12:58:03Z

📌 Commit fa66b8a has been approved by Centril

bors · 2019-04-27T13:59:27Z

⌛ Testing commit fa66b8a with merge 23c04ad1d0a44ba417eab177a8c6db3bd487df7e...

bors · 2019-04-27T14:04:08Z

💔 Test failed - checks-travis

rust-highfive · 2019-04-27T14:04:10Z

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_fold:end:before_install.3
travis_fold:start:install
travis_time:start:362f258e
$ case "$TRAVIS_OS_NAME" in linux) travis_retry curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl && chmod +x $HOME/stamp && export PATH=$PATH:$HOME ;; osx) if [[ "$RUST_CHECK_TARGET" == dist ]]; then travis_retry brew update && travis_retry brew install xz && travis_retry brew install swig; fi && travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin && chmod +x /usr/local/bin/sccache && travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin && chmod +x /usr/local/bin/stamp && travis_retry curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - && export CC=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang && export CXX=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++ && export AR=ar ;; esac
curl: (56) Recv failure: Connection reset by peer
The command "curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz" failed. Retrying, 2 of 3.
clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang-7: Lzma library error: Corrupted input data
tar: Error exit delayed from previous errors.
travis_time:end:362f258e:start=1556373741184352000,finish=1556373760026216000,duration=18841864000
The command "case "$TRAVIS_OS_NAME" in linux) travis_retry curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl && chmod +x $HOME/stamp && export PATH=$PATH:$HOME ;; osx) if [[ "$RUST_CHECK_TARGET" == dist ]]; then travis_retry brew update && travis_retry brew install xz && travis_retry brew install swig; fi && travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin && chmod +x /usr/local/bin/sccache && travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin && chmod +x /usr/local/bin/stamp && travis_retry curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - && export CC=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang && export CXX=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++ && export AR=ar ;; esac" failed and exited with 1 during .
Your build has been stopped.

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 · 2019-04-27T14:06:18Z

@bors retry

bors · 2019-04-27T14:06:46Z

⌛ Testing commit fa66b8a with merge c751c7a...

@ghost

Rollup of 5 pull requests Successful merges: - #60292 (Replace the `&'tcx List<Ty<'tcx>>` in `TyKind::Tuple` with `SubstsRef<'tcx>`) - #60307 (Make "Implementations on Foreign Types" items in sidebar link to specific impls) - #60309 (Add 1.34.1 release notes) - #60315 (bootstrap: use correct version numbers for llvm-tools and lldb) - #60316 (Use "capacity" as parameter name in with_capacity() methods) Failed merges: r? @ghost

bors · 2019-04-27T16:57:37Z

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

emilyalbini and others added 12 commits April 26, 2019 16:52

update release notes for 1.34.1

01334ea

bootstrap: use correct version numbers for llvm-tools and lldb

c1a4588

Use "capacity" as parameter name in with_capacity() methods

be12ab0

Closes rust-lang#60271.

Make "Implementations on Foreign Types" items in sidebar link to spec…

d2b4f4d

…ific impls

Add expect_ty method to Kind

728a2db

Replace &'tcx List<Ty<'tcx>> in Tuple with SubstsRef<'tcx>

283ca76

Update handling of Tuple

a3470c6

Rollup merge of rust-lang#60307 - dima74:fix/56018, r=GuillaumeGomez

356a981

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)

Rollup merge of rust-lang#60309 - pietroalbini:relnotes-1.34.1, r=pie…

7f68574

…troalbini Add 1.34.1 release notes This is a backport of the release notes from the 1.34.1 release. r? @ghost

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

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 Apr 27, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 27, 2019

This was referenced Apr 27, 2019

Internal lints: usage_of_qualified_ty & ty_pass_by_reference #60317

Merged

Use "capacity" as parameter name in with_capacity() methods #60316

Merged

bors mentioned this pull request Apr 27, 2019

bootstrap: use correct version numbers for llvm-tools and lldb #60315

Merged

bors merged commit fa66b8a into rust-lang:master Apr 27, 2019

Centril deleted the rollup-wv8g1ex branch April 27, 2019 16:58

bors mentioned this pull request Apr 27, 2019

[let_chains, 1/6] Remove hir::ExprKind::If #59288

Merged

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests#60329

Rollup of 5 pull requests#60329
bors merged 12 commits intorust-lang:masterfrom
Centril:rollup-wv8g1ex

Centril commented Apr 27, 2019

Uh oh!

Centril commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

rust-highfive commented Apr 27, 2019

Uh oh!

Centril commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

Centril commented Apr 27, 2019

Uh oh!

Centril commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

rust-highfive commented Apr 27, 2019

Uh oh!

Centril commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

bors commented Apr 27, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants