Rollup of 13 pull requests #52324

kennytm · 2018-07-12T20:12:53Z

Successful merges:

Change RangeInclusive to a three-field struct. #51622 (Change RangeInclusive to a three-field struct.)
Provide llvm-strip in llvm-tools component #51962 (Provide llvm-strip in llvm-tools component)
Implement Option::replace in the core library #52003 (Implement Option::replace in the core library)
Update std::ascii::ASCIIExt deprecation notes #52156 (Update std::ascii::ASCIIExt deprecation notes)
Deny bare trait objects in src/libstd #52221 (Deny bare trait objects in src/libstd)
llvm-tools-preview: fix build-manifest #52280 (llvm-tools-preview: fix build-manifest)
Deny bare trait objects in src/librustc_save_analysis #52290 (Deny bare trait objects in src/librustc_save_analysis)
Deny bare trait objects in librustc_typeck #52293 (Deny bare trait objects in librustc_typeck)
Deny bare trait objects in src/libserialize #52299 (Deny bare trait objects in src/libserialize)
Deny bare trait objects in the rest of rust #52302 (Deny bare trait objects in the rest of rust)
Backport 1.27.1 release notes to master #52310 (Backport 1.27.1 release notes to master)
Resolve FIXME(#27942) #52315 (Resolve FIXME(DestructionScopeData can leak into error messages #27942))
Update llvm-rebuild-trigger in light of LLVM 7 upgrade #52322 (Update llvm-rebuild-trigger in light of LLVM 7 upgrade)

Failed merges:

When the index is not PartialOrd, always treat the range as empty.

@japaric

Shipping this tool gives people reliable way to reduce the generated executable size. I'm not sure if this strip tool is available from the llvm version current rust is built on. But let's take a look. @japaric

…, r=SimonSapin Change RangeInclusive to a three-field struct. Fix rust-lang#45222. This PR also reverts rust-lang#48012 (i.e. removed the `try_fold`/`try_rfold` specialization for `RangeInclusive`) because LLVM no longer has trouble recognizing a RangeInclusive loop.

@japaric

Provide llvm-strip in llvm-tools component Shipping this tool gives people reliable way to reduce the generated executable size. I'm not sure if this strip tool is available from the llvm version current rust is built on. But let's take a look. @japaric

Implement `Option::replace` in the core library Here is the implementation of the `Option::replace` method. The first step of [the tracking issue rust-lang#51998](rust-lang#51998).

… r=Kimundi Update std::ascii::ASCIIExt deprecation notes Fixes rust-lang#52085

Deny bare trait objects in src/libstd Enforce #![deny(bare_trait_objects)] in src/libstd.

@alexcrichton

llvm-tools-preview: fix build-manifest r? @alexcrichton

…r=cramertj Deny bare trait objects in src/librustc_save_analysis Enforce `#![deny(bare_trait_objects)]` in `src/librustc_save_analysis`.

Deny bare trait objects in librustc_typeck Enforce `#![deny(bare_trait_objects)]` in `src/librustc_typeck`.

Deny bare trait objects in src/libserialize Enforce `#![deny(bare_trait_objects)]` in `src/libserialize`.

Deny bare trait objects in the rest of rust Add `#![deny(bare_trait_objects)]` to all the modules not covered before (those did not require code changes) that I consider applicable (I left out shims) in order to futureproof them.

@pietroalbini

…ort-from-stable, r=pietroalbini Backport 1.27.1 release notes to master r? @pietroalbini

Resolve FIXME(rust-lang#27942) [related issue](rust-lang#27942) cc [rust-lang#44366](rust-lang#44366)

@alexcrichton

…excrichton Update llvm-rebuild-trigger in light of LLVM 7 upgrade Not triggering a LLVM rebuild [since the LLVM 7 upgrade](rust-lang#51966 (comment)) causes builds of rustc to fail. r? @alexcrichton

kennytm · 2018-07-12T20:13:35Z

@bors r+ p=13

bors · 2018-07-12T20:13:36Z

📌 Commit 754f60f has been approved by kennytm

bors · 2018-07-12T22:09:46Z

⌛ Testing commit 754f60f with merge e6774bc3895299c94fe81abcf23d938cde0e0466...

bors · 2018-07-12T23:20:08Z

💔 Test failed - status-travis

rust-highfive · 2018-07-12T23:20:09Z

The job dist-various-1 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.

[01:06:28]    Compiling panic_unwind v0.0.0 (file:///checkout/src/libpanic_unwind)
[01:06:29] [RUSTC-TIMING] panic_unwind test:false 0.237
[01:06:29] warning: dropping unsupported crate type `dylib` for target `x86_64-unknown-redox`
[01:06:29] 
[01:06:30] error: trait objects without an explicit `dyn` are deprecated
[01:06:30]   --> libstd/sys/redox/process.rs:54:23
[01:06:30]    |
[01:06:30] 54 |     closures: Vec<Box<FnMut() -> io::Result<()> + Send + Sync>>,
[01:06:30]    |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `dyn`: `dyn FnMut() -> io::Result<()> + Send + Sync`
[01:06:30] note: lint level defined here
[01:06:30]   --> libstd/lib.rs:224:9
[01:06:30]    |
[01:06:30]    |
[01:06:30] 224| #![deny(bare_trait_objects)]
[01:06:30] 
[01:06:30] 
[01:06:30] error: trait objects without an explicit `dyn` are deprecated
[01:06:30]    --> libstd/sys/redox/process.rs:125:31
[01:06:30]     |
[01:06:30] 125 |                        f: Box<FnMut() -> io::Result<()> + Send + Sync>) {
[01:06:30]     |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `dyn`: `dyn FnMut() -> io::Result<()> + Send + Sync`
[01:06:32] error: aborting due to 2 previous errors
[01:06:32] 
[01:06:32] [RUSTC-TIMING] std test:false 3.282
[01:06:32] error: Could not compile `std`.
[01:06:32] error: Could not compile `std`.
[01:06:32] 
[01:06:32] Caused by:
[01:06:32]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name std libstd/lib.rs --color always --error-format json --crate-type dylib --crate-type rlib --emit=dep-info,link -C prefer-dynamic -C opt-level=2 --cfg feature="alloc_jemalloc" --cfg feature="backtrace" --cfg feature="jemalloc" --cfg feature="panic-unwind" --cfg feature="panic_unwind" -C metadata=2e8e237846c4d089 -C extra-filename=-2e8e237846c4d089 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps --target x86_64-unknown-redox -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/deps --extern alloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/liballoc-5223e952bfc9836f.rlib --extern alloc_jemalloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/liballoc_jemalloc-97d2c134bcb04f15.rlib --extern alloc_system=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/liballoc_system-87e7e4f30c314de7.rlib --extern compiler_builtins=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libcompiler_builtins-7c669ba5e870ed5a.rlib --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libcore-33cdf35bf7d87eda.rlib --extern libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/liblibc-e64d79f4c80deb60.rlib --extern panic_abort=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libpanic_abort-4fdfedbe551ea7b6.rlib --extern panic_unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libpanic_unwind-4c945d2b7c6b4d4b.rlib --extern std_unicode=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libstd_unicode-b66524888adce754.rlib --extern unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libunwind-3d960dcb5fcea9df.rlib -L native=/checkout/obj/build/x86_64-unknown-redox/native/libbacktrace/ -L native=/checkout/obj/build/x86_64-unknown-redox/native/libbacktrace -l static=backtrace -l static=backtrace -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/build/compiler_builtins-b3b8572fe35a60a7/out` (exit code: 101)
[01:06:32] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-redox" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
[01:06:32] expected success, got: exit code: 101
[01:06:32] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1117:9
[01:06:32] travis_fold:end:stage2-std

[01:06:32] travis_time:end:stage2-std:start=1531437426166175574,finish=1531437479930530509,duration=53764354935

---
travis_time:end:0a255400:start=1531437482402388042,finish=1531437482409327476,duration=6939434
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1b7412d9
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:001dda6e
$ 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)

rust-highfive · 2018-07-12T23:20:17Z

The job dist-various-1 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.

[01:06:28]    Compiling panic_unwind v0.0.0 (file:///checkout/src/libpanic_unwind)
[01:06:29] [RUSTC-TIMING] panic_unwind test:false 0.237
[01:06:29] warning: dropping unsupported crate type `dylib` for target `x86_64-unknown-redox`
[01:06:29] 
[01:06:30] error: trait objects without an explicit `dyn` are deprecated
[01:06:30]   --> libstd/sys/redox/process.rs:54:23
[01:06:30]    |
[01:06:30] 54 |     closures: Vec<Box<FnMut() -> io::Result<()> + Send + Sync>>,
[01:06:30]    |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `dyn`: `dyn FnMut() -> io::Result<()> + Send + Sync`
[01:06:30] note: lint level defined here
[01:06:30]   --> libstd/lib.rs:224:9
[01:06:30]    |
[01:06:30]    |
[01:06:30] 224| #![deny(bare_trait_objects)]
[01:06:30] 
[01:06:30] 
[01:06:30] error: trait objects without an explicit `dyn` are deprecated
[01:06:30]    --> libstd/sys/redox/process.rs:125:31
[01:06:30]     |
[01:06:30] 125 |                        f: Box<FnMut() -> io::Result<()> + Send + Sync>) {
[01:06:30]     |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `dyn`: `dyn FnMut() -> io::Result<()> + Send + Sync`
[01:06:32] error: aborting due to 2 previous errors
[01:06:32] 
[01:06:32] [RUSTC-TIMING] std test:false 3.282
[01:06:32] error: Could not compile `std`.
[01:06:32] error: Could not compile `std`.
[01:06:32] 
[01:06:32] Caused by:
[01:06:32]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name std libstd/lib.rs --color always --error-format json --crate-type dylib --crate-type rlib --emit=dep-info,link -C prefer-dynamic -C opt-level=2 --cfg feature="alloc_jemalloc" --cfg feature="backtrace" --cfg feature="jemalloc" --cfg feature="panic-unwind" --cfg feature="panic_unwind" -C metadata=2e8e237846c4d089 -C extra-filename=-2e8e237846c4d089 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps --target x86_64-unknown-redox -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/deps --extern alloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/liballoc-5223e952bfc9836f.rlib --extern alloc_jemalloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/liballoc_jemalloc-97d2c134bcb04f15.rlib --extern alloc_system=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/liballoc_system-87e7e4f30c314de7.rlib --extern compiler_builtins=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libcompiler_builtins-7c669ba5e870ed5a.rlib --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libcore-33cdf35bf7d87eda.rlib --extern libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/liblibc-e64d79f4c80deb60.rlib --extern panic_abort=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libpanic_abort-4fdfedbe551ea7b6.rlib --extern panic_unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libpanic_unwind-4c945d2b7c6b4d4b.rlib --extern std_unicode=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libstd_unicode-b66524888adce754.rlib --extern unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/deps/libunwind-3d960dcb5fcea9df.rlib -L native=/checkout/obj/build/x86_64-unknown-redox/native/libbacktrace/ -L native=/checkout/obj/build/x86_64-unknown-redox/native/libbacktrace -l static=backtrace -l static=backtrace -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-redox/release/build/compiler_builtins-b3b8572fe35a60a7/out` (exit code: 101)
[01:06:32] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-redox" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
[01:06:32] expected success, got: exit code: 101
[01:06:32] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1117:9
[01:06:32] travis_fold:end:stage2-std

[01:06:32] travis_time:end:stage2-std:start=1531437426166175574,finish=1531437479930530509,duration=53764354935

---
travis_time:end:0a255400:start=1531437482402388042,finish=1531437482409327476,duration=6939434
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1b7412d9
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:001dda6e
$ 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)

kennytm and others added 30 commits June 30, 2018 16:54

Change RangeInclusive to a three-field struct.

4d9b6c9

Fix rust-lang#45222.

Fix some RangeInclusive test cases.

0fa94e7

Upgrade implementation of StepBy<RangeInclusive<_>>.

37fbf68

Include is_empty() in PartialEq and Hash.

5e3bd09

When the index is not PartialOrd, always treat the range as empty.

Provide llvm-strip in llvm-tools component

de2ecea

Shipping this tool gives people reliable way to reduce the generated executable size. I'm not sure if this strip tool is available from the llvm version current rust is built on. But let's take a look. @japaric

Implement Option::replace in the core library

6035534

Update std::ascii::ASCIIExt deprecation notes

2c2add6

Add a basic test to Option::replace

af87a35

Fix the documentation of Option::replace

c8f0e6f

Deny bare trait objects in src/libstd.

560d807

Add missing dyn for cloudabi, redox, unix and wasm

b29a6fb

Add missing dyn in tests

1915cd1

llvm-tools-preview: fix build-manifest

f45d5eb

Deny bare trait objects in src/librustc_save_analysis

0d7b2e6

Deny bare trait objects in librustc_typeck

f29ac5a

Deny bare trait objects in src/libserialize

0878453

Deny bare trait objects in the rest of rust

5058af7

Backport 1.27.1 release notes to master

4c340a2

Resolve FIXME(rust-lang#27942)

72f096b

Update llvm-rebuild-trigger in light of LLVM 7 upgrade

9ead0d8

Rollup merge of rust-lang#52003 - Kerollmops:option-replace, r=Kimundi

e2683f2

Implement `Option::replace` in the core library Here is the implementation of the `Option::replace` method. The first step of [the tracking issue rust-lang#51998](rust-lang#51998).

Rollup merge of rust-lang#52156 - zajlerke:update-deprecation-notice,…

530ddcd

… r=Kimundi Update std::ascii::ASCIIExt deprecation notes Fixes rust-lang#52085

Rollup merge of rust-lang#52221 - ljedrz:dyn_libstd, r=Kimundi

efad6f1

Deny bare trait objects in src/libstd Enforce #![deny(bare_trait_objects)] in src/libstd.

Rollup merge of rust-lang#52280 - japaric:llvm-tools-preview, r=kennytm

360412e

llvm-tools-preview: fix build-manifest r? @alexcrichton

Rollup merge of rust-lang#52290 - ljedrz:dyn_librustc_save_analysis, …

15925fc

…r=cramertj Deny bare trait objects in src/librustc_save_analysis Enforce `#![deny(bare_trait_objects)]` in `src/librustc_save_analysis`.

Rollup merge of rust-lang#52293 - ljedrz:dyn_librustc_typeck, r=estebank

36a4b20

Deny bare trait objects in librustc_typeck Enforce `#![deny(bare_trait_objects)]` in `src/librustc_typeck`.

Rollup merge of rust-lang#52299 - ljedrz:dyn_libserialize, r=cramertj

739056d

Deny bare trait objects in src/libserialize Enforce `#![deny(bare_trait_objects)]` in `src/libserialize`.

kennytm added 3 commits July 13, 2018 04:12

Rollup merge of rust-lang#52310 - Mark-Simulacrum:release-notes-backp…

cd78a44

…ort-from-stable, r=pietroalbini Backport 1.27.1 release notes to master r? @pietroalbini

Rollup merge of rust-lang#52315 - ljedrz:FIXME_#27942, r=petrochenkov

f8039bf

Resolve FIXME(rust-lang#27942) [related issue](rust-lang#27942) cc [rust-lang#44366](rust-lang#44366)

Rollup merge of rust-lang#52322 - varkor:llvm-7-rebuild-trigger, r=al…

754f60f

…excrichton Update llvm-rebuild-trigger in light of LLVM 7 upgrade Not triggering a LLVM rebuild [since the LLVM 7 upgrade](rust-lang#51966 (comment)) causes builds of rustc to fail. r? @alexcrichton

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 12, 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 Jul 12, 2018

kennytm closed this Jul 12, 2018

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 13 pull requests #52324

Rollup of 13 pull requests #52324

kennytm commented Jul 12, 2018

kennytm commented Jul 12, 2018

bors commented Jul 12, 2018

bors commented Jul 12, 2018

bors commented Jul 12, 2018

rust-highfive commented Jul 12, 2018

rust-highfive commented Jul 12, 2018

Rollup of 13 pull requests #52324

Rollup of 13 pull requests #52324

Conversation

kennytm commented Jul 12, 2018

kennytm commented Jul 12, 2018

bors commented Jul 12, 2018

bors commented Jul 12, 2018

bors commented Jul 12, 2018

rust-highfive commented Jul 12, 2018

rust-highfive commented Jul 12, 2018