Rollup of 17 pull requests #53530

kennytm · 2018-08-20T17:20:29Z

Successful merges:

Updated RELEASES.md for 1.29.0 #53030 (Updated RELEASES.md for 1.29.0)
expand the documentation on the Unpin trait #53104 (expand the documentation on the Unpin trait)
Stabilize IP associated constants #53213 (Stabilize IP associated constants)
When closure with no arguments was expected, suggest wrapping #53296 (When closure with no arguments was expected, suggest wrapping)
Replace usages of ptr::offset with ptr::{add,sub}. #53329 (Replace usages of ptr::offset with ptr::{add,sub}.)
add individual docs to core::num::NonZero* #53363 (add individual docs to core::num::NonZero*)
Stabilize macro_vis_matcher #53370 (Stabilize macro_vis_matcher)
Mark libserialize functions as inline #53393 (Mark libserialize functions as inline)
restore the page title after escaping out of a search #53405 (restore the page title after escaping out of a search)
Change target triple used to check for lldb in build-manifest #53452 (Change target triple used to check for lldb in build-manifest)
Document Box::into_raw returns non-null ptr #53462 (Document Box::into_raw returns non-null ptr)
Remove LinkMeta struct #53465 (Remove LinkMeta struct)
update lld submodule to include RISCV patch #53492 (update lld submodule to include RISCV patch)
Fix typos found by codespell. #53496 (Fix typos found by codespell.)
syntax: Optimize some literal parsing #53521 (syntax: Optimize some literal parsing)
Moved issue-53157.rs into src/test/ui/consts/const-eval/ #53540 (Moved issue-53157.rs into src/test/ui/consts/const-eval/)
Avoid some Place clones. #53551 (Avoid some Place clones.)

Failed merges:

provides an overview of the Pin API which the trait is for, and show how it can be used in making self referencial structs part of rust-lang#49150

Fixes rust-lang#44582

The wrong target triple was used for lldb in build-manifest. lldb is only built for macOS, so update the triple to reflect that. This is an attempt to fix bug#48168.

This pulls in one new commit, to add support for linking static RISCV binaries, suitable for the new riscv32imac-unknown-none-elf target. See: rust-lang/lld#1

@Mark-Simulacrum

Updated RELEASES.md for 1.29.0 [Rendered](https://github.com/Aaronepower/rust/blob/master/RELEASES.md) r? @Mark-Simulacrum cc @rust-lang/release

…odrAus Stabilize IP associated constants Fixes rust-lang#44582

When closure with no arguments was expected, suggest wrapping Fix rust-lang#49694.

kennytm · 2018-08-20T17:20:57Z

@bors r+ p=13

bors · 2018-08-20T17:20:59Z

📌 Commit 76a760ccecc0d6788522540b46c07812365baae0 has been approved by kennytm

Moved issue-53157.rs into src/test/ui/consts/const-eval/

kennytm · 2018-08-21T09:52:47Z

@bors r+

Removed #53480 (apparent test failure)
Removed #53329 (already testing)

Added #53104, #53540.

bors · 2018-08-21T09:52:47Z

📌 Commit 9bbab65 has been approved by kennytm

bors · 2018-08-21T10:51:15Z

⌛ Testing commit 9bbab65 with merge 21cc9397c766831c58b15866709f064944c504ad...

bors · 2018-08-21T13:52:06Z

💔 Test failed - status-travis

rust-highfive · 2018-08-21T13:52:08Z

The job dist-x86_64-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:38] 
[00:01:38] Total download size: 4.9 M
[00:01:38] Downloading Packages:
[00:01:38] --------------------------------------------------------------------------------
[00:01:38] Total                                            22 MB/s | 4.9 MB     00:00     
[00:01:38] warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID e8562897
[00:01:38] Importing GPG key 0xE8562897 "CentOS-5 Key (CentOS 5 Official Signing Key) <[email protected]>" from /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
[00:01:38] Running Transaction Test
[00:01:38] Finished Transaction Test
[00:01:38] Transaction Test Succeeded
[00:01:38] Running Transaction
---
[00:03:13] + hide_output make install
[00:03:13] + set +x
[00:03:32] shared.sh: line 11:   351 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:03:32] + cd ..
[00:03:32] + rm -rf openssl-1.0.2k
[00:03:32] ./build-openssl.sh: line 25:  4114 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"  (wd: /tmp/openssl-1.0.2k)
[00:03:32] + ln -nsf /etc/pki/tls/cert.pem /rustroot/ssl/
[00:03:33] Removing intermediate container 86c11a83fc6f
[00:03:33] Step 14/38 : COPY dist-x86_64-linux/build-curl.sh /tmp/
[00:03:33]  ---> 447a409ad779
[00:03:33] Step 15/38 : RUN ./build-curl.sh
[00:03:33] Step 15/38 : RUN ./build-curl.sh
[00:03:33]  ---> Running in 03e88d8bcbcd
[00:03:33] + source shared.sh
[00:03:33] + VERSION=7.51.0
[00:03:33] + curl http://cool.haxx.se/download/curl-7.51.0.tar.bz2
[00:03:35]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[00:03:35]                                  Dload  Upload   Total   Spent    Left  Speed
[00:03:36] 
  0 2509k    0 14215    0     0   9165      0  0:04:40  0:00:01  0:04:39  9165
  0 2509k    0 14215    0     0   9165      0  0:04:40  0:00:01  0:04:39  9165
 52 2509k   52 1310k    0     0   533k      0  0:00:04  0:00:02  0:00:02 1426k
100 2509k  100 2509k    0     0   908k      0  0:00:02  0:00:02 --:--:-- 2061k
[00:03:36] + mkdir curl-build
[00:03:36] + cd curl-build
[00:03:36] + 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:03:58] + hide_output make -j10
[00:03:58] + set +x
[00:04:11] shared.sh: line 11:    12 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:04:11] + hide_output make install
---
 94 82.1M   94 77.3M    0     0  3605k      0  0:00:23  0:00:21  0:00:02 3208k
 98 82.1M   98 80.8M    0     0  3605k      0  0:00:23  0:00:22  0:00:01 3451k
100 82.1M  100 82.1M    0     0  3586k      0  0:00:23  0:00:23 --:--:-- 3412k
[00:08:00] + cd gcc-4.8.5
[00:08:00] + sed -i 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
[00:08:00] --2018-08-21 11:00:30--  http://gcc.gnu.org/pub/gcc/infrastructure/mpfr-2.4.2.tar.bz2
[00:08:00] Resolving gcc.gnu.org... 209.132.180.131
[00:08:00] Connecting to gcc.gnu.org|209.132.180.131|:80... connected.
[00:08:00] HTTP request sent, awaiting response... 200 OK
---
[00:41:50]  ---> 2eab8d65158e
[00:41:50] Step 25/38 : RUN ./build-clang.sh
[00:41:50]  ---> Running in 6ca89c5949a9
[00:41:51] + source shared.sh
[00:41:51] + LLVM=6.0.0
[00:41:51] + mkdir clang
[00:41:51] + cd clang
[00:41:51] + curl https://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz
[00:41:51] + tar xf -
[00:41:51] + xz -d
[00:41:51]                                  Dload  Upload   Total   Spent    Left  Speed
[00:41:54] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
 34 24.1M   34 8479k    0     0  7191k      0  0:00:03  0:00:01  0:00:02 8378k
 70 24.1M   70 16.8M    0     0  7940k      0  0:00:03  0:00:02  0:00:01 8600k
100 24.1M  100 24.1M    0     0  8111k      0  0:00:03  0:00:03 --:--:-- 8583k
[00:41:54] + cd llvm-6.0.0.src
[00:41:54] + mkdir -p tools/clang
[00:41:54] + curl https://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz
[00:41:54] + xz -d
[00:41:54] + tar xf - -C tools/clang --strip-components=1
[00:41:54]                                  Dload  Upload   Total   Spent    Left  Speed
[00:41:55] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  1 11.4M    1  147k    0     0  1252k      0  0:00:09 --:--:--  0:00:09 1264k
  1 11.4M    1  147k    0     0  1252k      0  0:00:09 --:--:--  0:00:09 1264k
 65 11.4M   65 7667k    0     0  6853k      0  0:00:01  0:00:01 --:--:-- 6864k
100 11.4M  100 11.4M    0     0  7552k      0  0:00:01  0:00:01 --:--:-- 7559k
[00:41:55] + mkdir ../clang-build
[00:41:55] + cd ../clang-build
[00:41:55] + INC=/rustroot/include
[00:41:55] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed
[00:41:55] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed:/usr/include
[00:41:55] + hide_output cmake ../llvm-6.0.0.src -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 -DC_INCLUDE_DIRS=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed:/usr/include
[00:42:24] + hide_output make -j10
[00:42:24] + set +x
[00:42:54] Tue Aug 21 11:35:25 UTC 2018 - building ...
[00:43:24] Tue Aug 21 11:35:55 UTC 2018 - building ...
---
[01:33:07] Step 28/38 : RUN ./build-git.sh
[01:33:07]  ---> Running in bb35bcf78f7c
[01:33:07] + source shared.sh
[01:33:07] + tar xzf -
[01:33:07] + curl -L https://www.kernel.org/pub/software/scm/git/git-2.10.0.tar.gz
[01:33:07]                                  Dload  Upload   Total   Spent    Left  Speed
[01:33:08] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
---
[01:34:08] + set +x
[01:34:09] + hide_output make INSTALL_HDR_PATH=dest headers_install
[01:34:09] + set +x
[01:34:13] shared.sh: line 11:    10 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[01:34:13] + find dest/include '(' -name .install -o -name ..install.cmd ')' -delete
[01:34:13] + yes
[01:34:13] + yes
[01:34:13] + cp -fr dest/include/asm dest/include/asm-generic dest/include/drm dest/include/linux dest/include/mtd dest/include/rdma dest/include/scsi dest/include/sound dest/include/video dest/include/xen /usr/include
[01:34:13] + rm -rf linux-3.2.84
[01:34:14]  ---> c79326365065
[01:34:14] Removing intermediate container 909e408c9d09
[01:34:14] Step 31/38 : COPY scripts/sccache.sh /scripts/
---
[02:57:06] [RUSTC-TIMING] syntax_pos test:false 3.596
[02:57:06]    Compiling rustc-ap-rustc_errors v218.0.0
[02:57:13] [RUSTC-TIMING] rustc_errors test:false 6.983
[02:58:25] [RUSTC-TIMING] syntax test:false 72.122
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)

…lfJung Replace usages of ptr::offset with ptr::{add,sub}. Rust provides these helper methods – so let's use them!

…rted, r=varkor Avoid some Place clones. This is a 0.5% speedup on ripgrep.

kennytm · 2018-08-21T14:11:21Z

We should add a warning against any non-functional changes to files in src/ci/docker/scripts/ 😐

@bors r+

Added back #53329.
Added #53551.

bors · 2018-08-21T14:11:21Z

📌 Commit e3887e6 has been approved by kennytm

bors · 2018-08-21T16:04:18Z

⌛ Testing commit e3887e6 with merge 9f9f2c0...

@ghost

Rollup of 17 pull requests Successful merges: - #53030 (Updated RELEASES.md for 1.29.0) - #53104 (expand the documentation on the `Unpin` trait) - #53213 (Stabilize IP associated constants) - #53296 (When closure with no arguments was expected, suggest wrapping) - #53329 (Replace usages of ptr::offset with ptr::{add,sub}.) - #53363 (add individual docs to `core::num::NonZero*`) - #53370 (Stabilize macro_vis_matcher) - #53393 (Mark libserialize functions as inline) - #53405 (restore the page title after escaping out of a search) - #53452 (Change target triple used to check for lldb in build-manifest) - #53462 (Document Box::into_raw returns non-null ptr) - #53465 (Remove LinkMeta struct) - #53492 (update lld submodule to include RISCV patch) - #53496 (Fix typos found by codespell.) - #53521 (syntax: Optimize some literal parsing) - #53540 (Moved issue-53157.rs into src/test/ui/consts/const-eval/) - #53551 (Avoid some Place clones.) Failed merges: r? @ghost

bors · 2018-08-21T18:16:06Z

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 9f9f2c0 to master...

Aaron Power and others added 28 commits August 3, 2018 16:11

Updated RELEASES.md for 1.29.0

3350eaf

Update RELEASES.md

a646c10

Update RELEASES.md

96f50f1

Update RELEASES.md

b4924bf

expand the documentation on the Unpin trait

038ce65

provides an overview of the Pin API which the trait is for, and show how it can be used in making self referencial structs part of rust-lang#49150

correct explenation on the usage of NonNull

6845dc4

fix link to PinBox

9b7d710

fix style issues in doc comment

87bbd2e

remove general pinning information from Unpin trait

68e766a

add individual docs to core::num::NonZero*

687cc98

Stabilize IP associated constants

e6244e5

Fixes rust-lang#44582

Mark libserialize functions as inline

bc900f5

When closure with no arguments was expected, suggest wrapping

e5e14d3

update recently moved tests

cea73d6

restore the page title after escaping out of a search

2075509

add example for moving out of pointer

03530fa

Remove inline attribute on generic functions

1540e8c

Change target triple used to check for lldb in build-manifest

c37787e

The wrong target triple was used for lldb in build-manifest. lldb is only built for macOS, so update the triple to reflect that. This is an attempt to fix bug#48168.

clarify use of Unpin and pinning types

6ae915b

Remove LinkMeta struct

d52047f

update lld submodule to include RISCV patch

99bba34

This pulls in one new commit, to add support for linking static RISCV binaries, suitable for the new riscv32imac-unknown-none-elf target. See: rust-lang/lld#1

Fix typos found by codespell.

71120ef

Stabilize macro_vis_matcher

00920c0

Replace usages of ptr::offset with ptr::{add,sub}.

993fb93

Document Box::into_raw returns non-null ptr

de35b66

Rollup merge of rust-lang#53030 - Aaronepower:master, r=Mark-Simulacrum

b51723a

Updated RELEASES.md for 1.29.0 [Rendered](https://github.com/Aaronepower/rust/blob/master/RELEASES.md) r? @Mark-Simulacrum cc @rust-lang/release

Rollup merge of rust-lang#53213 - tmccombs:stable-ipconstructors, r=K…

fa3d56a

…odrAus Stabilize IP associated constants Fixes rust-lang#44582

Rollup merge of rust-lang#53296 - estebank:suggest-closure, r=KodrAus

ffde96c

When closure with no arguments was expected, suggest wrapping Fix rust-lang#49694.

Rollup merge of rust-lang#53540 - TheDarkula:move-test, r=oli-obk

9bbab65

Moved issue-53157.rs into src/test/ui/consts/const-eval/

kennytm force-pushed the rollup branch from fd0a6d2 to 9bbab65 Compare August 21, 2018 09:52

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 Aug 21, 2018

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 Aug 21, 2018

kennytm added 2 commits August 21, 2018 22:05

Rollup merge of rust-lang#53329 - frewsxcv:frewsxcv-ptr-add-sub, r=Ra…

0dd88c9

…lfJung Replace usages of ptr::offset with ptr::{add,sub}. Rust provides these helper methods – so let's use them!

Rollup merge of rust-lang#53551 - nnethercote:access_place_error_repo…

e3887e6

…rted, r=varkor Avoid some Place clones. This is a 0.5% speedup on ripgrep.

kennytm changed the title ~~Rollup of 15 pull requests~~ Rollup of 17 pull requests Aug 21, 2018

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 Aug 21, 2018

bors merged commit e3887e6 into rust-lang:master Aug 21, 2018

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

Rollup of 17 pull requests #53530

Rollup of 17 pull requests #53530

kennytm commented Aug 20, 2018 •

edited

Loading

kennytm commented Aug 20, 2018

bors commented Aug 20, 2018

kennytm commented Aug 21, 2018

bors commented Aug 21, 2018

bors commented Aug 21, 2018

bors commented Aug 21, 2018

rust-highfive commented Aug 21, 2018

kennytm commented Aug 21, 2018

bors commented Aug 21, 2018

bors commented Aug 21, 2018

bors commented Aug 21, 2018

Rollup of 17 pull requests #53530

Rollup of 17 pull requests #53530

Conversation

kennytm commented Aug 20, 2018 • edited Loading

kennytm commented Aug 20, 2018

bors commented Aug 20, 2018

kennytm commented Aug 21, 2018

bors commented Aug 21, 2018

bors commented Aug 21, 2018

bors commented Aug 21, 2018

rust-highfive commented Aug 21, 2018

kennytm commented Aug 21, 2018

bors commented Aug 21, 2018

bors commented Aug 21, 2018

bors commented Aug 21, 2018

kennytm commented Aug 20, 2018 •

edited

Loading