Rollup of 10 pull requests#43487

Mark-Simulacrum · 2017-07-26T12:15:10Z

Successful merges: Make the "main" constructors of NonZero/Shared/Unique return Option #42959, Point at path segment on module not found #43447, add a note to Vec's Extend<&T> impl about its slice specialization #43455, std::thread::spawn: Fix grammar in documentation #43456, Fix printing regions with -Z verbose #43458, DNS functions are in libresolv on Solaris, just like on MacOS #43462, Fix the spans of catch blocks to include the do #43463, Add tests for issues with the E-needstest label #43465, Add missing impl and tests for int to int TryFrom impls #43471, Constrain the layout of Blake2bCtx for proper SPARC compilation #43480
Failed merges:

… to remove an `unsafe` block.

… to protect against UB in the unlikely case that `idx + 1` overflows.

On SPARC, optimization fuel ends up emitting incorrect load and store instructions for the transmute() call in blake2b_compress(). If we force Blake2bCtx to be repr(C), the problem disappears. Fixes rust-lang#43346

Point at the correct path segment on a import statement where a module doesn't exist. New output: ```rust error[E0432]: unresolved import `std::bar` --> <anon>:1:10 | 1 | use std::bar::{foo1, foo2}; | ^^^ Could not find `bar` in `std` ``` instead of: ```rust error[E0432]: unresolved import `std::bar::foo1` --> <anon>:1:16 | 1 | use std::bar::{foo1, foo2}; | ^^^^ Could not find `bar` in `std` error[E0432]: unresolved import `std::bar::foo2` --> <anon>:1:22 | 1 | use std::bar::{foo1, foo2}; | ^^^^ Could not find `bar` in `std` ```

Make the "main" constructors of NonZero/Shared/Unique return Option Per discussion in rust-lang#27730 (comment). This is a breaking change to unstable APIs. The old behavior is still available under the name `new_unchecked`. Note that only that one can be `const fn`, since `if` is currently not allowed in constant contexts. In the case of `NonZero` this requires adding a new `is_zero` method to the `Zeroable` trait. I mildly dislike this, but it’s not much worse than having a `Zeroable` trait in the first place. `Zeroable` and `NonZero` are both unstable, this can be reworked later.

Point at path segment on module not found Point at the correct path segment on a import statement where a module doesn't exist. New output: ```rust error[E0432]: unresolved import `std::bar` --> <anon>:1:10 | 1 | use std::bar::{foo1, foo2}; | ^^^ Could not find `bar` in `std` ``` instead of: ```rust error[E0432]: unresolved import `std::bar::foo1` --> <anon>:1:16 | 1 | use std::bar::{foo1, foo2}; | ^^^^ Could not find `bar` in `std` error[E0432]: unresolved import `std::bar::foo2` --> <anon>:1:22 | 1 | use std::bar::{foo1, foo2}; | ^^^^ Could not find `bar` in `std` ``` Fix rust-lang#43040.

…=steveklabnik add a note to Vec's Extend<&T> impl about its slice specialization From the regular documentation view, it's not at all apparent that [this specialization](https://github.com/rust-lang/rust/blob/5669c9988f50788b5ab5dee2d4538519d4e5663d/src/liballoc/vec.rs#L1879-L1891) exists for `slice::Iter`. This adds a documentation blurb to the Extend impl itself to note that this optimization exists.

…chton std::thread::spawn: Fix grammar in documentation Closes rust-lang#43435.

Fix printing regions with -Z verbose When dumping MIR with `-Z verbose`, it would print regions on types, but not in the code. It seems the Rvalue printing code tried to be smart and guessed when the `Display` for `Region` would not possibly print anything. This PR makes it no longer be smart, and just always use the `Display` like all the other code (e.g. printing types) does.

DNS functions are in libresolv on Solaris, just like on MacOS

Fix the spans of catch blocks to include the `do`

…lacrum Add tests for issues with the E-needstest label Fixes rust-lang#19181. Fixes rust-lang#29516. Fixes rust-lang#29798. Fixes rust-lang#33504. Fixes rust-lang#34780. Fixes rust-lang#39211. Fixes rust-lang#39467. Fixes rust-lang#39720.

@nagisa

Add missing impl and tests for int to int TryFrom impls These were missing from rust-lang#43248. r? @nagisa

Constrain the layout of Blake2bCtx for proper SPARC compilation On SPARC, optimization fuel ends up emitting incorrect load and store instructions for the transmute() call in blake2b_compress(). If we force Blake2bCtx to be repr(C), the problem disappears. Fixes rust-lang#43346

rust-highfive · 2017-07-26T12:15:21Z

r? @BurntSushi

(rust_highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2017-07-26T12:15:21Z

@bors r+ p=10

bors · 2017-07-26T12:15:21Z

📌 Commit 959ebd6 has been approved by Mark-Simulacrum

bors · 2017-07-26T12:26:00Z

⌛ Testing commit 959ebd6 with merge e75dfd129c849aa98926729c004f1ec51ae4781b...

bors · 2017-07-26T14:08:47Z

💔 Test failed - status-appveyor

kennytm · 2017-07-26T15:14:54Z

x86_64-pc-windows-msvc stage2-rls test failed, likely #43453, spurious.

Details

     Running build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\rls-63ddc6f60085b731.exe
running 14 tests
test build::cargo::test::test_dedup_flags ... ok
test server::test::server_message_get_method_name ... ok
test server::test::server_message_to_str ... ok
error[E0422]: cannot find struct, variant or union type `LibCfgTestStruct` in module `bin_lib_no_cfg_test`
 --> test_data\bin_lib_no_cfg_test\src\main.rs:5:37
  |
5 |     let test = bin_lib_no_cfg_test::LibCfgTestStruct { };
  |                                     ^^^^^^^^^^^^^^^^ not found in `bin_lib_no_cfg_test`
test test::test_bin_lib_project ... ok
test test::test_borrow_error ... ok
test test::test_completion ... ok
test test::test_find_all_refs ... ok
test test::test_find_all_refs_no_cfg_test ... ok
test test::test_multiple_binaries ... ok
test test::test_parse_error_on_malformed_input ... ok
test test::test_reformat ... ok
test test::test_reformat_with_range ... ok
test test::test_simple_workspace ... ok
test test::test_bin_lib_project_no_cfg_test ... FAILED
failures:
---- test::test_bin_lib_project_no_cfg_test stdout ----
	thread 'test::test_bin_lib_project_no_cfg_test' panicked at 'Hit timeout', src\tools\rls\src\test\harness.rs:142:12
failures:
    test::test_bin_lib_project_no_cfg_test
test result: FAILED. 13 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
error: test failed, to rerun pass '--bin rls'
command did not execute successfully: "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0/bin\\cargo.exe" "test" "-j" "2" "--target" "x86_64-pc-windows-msvc" "--release" "--locked" "--color" "always" "--manifest-path" "C:\\projects\\rust\\src/tools/rls/Cargo.toml"
expected success, got: exit code: 101

Mark-Simulacrum · 2017-07-26T15:32:03Z

@bors retry - RLS tests, cc #43453

bors · 2017-07-26T16:40:26Z

⌛ Testing commit 959ebd6 with merge 441acb35815d545c21c48b89064f8ed2fbf06001...

bors · 2017-07-26T18:27:15Z

💔 Test failed - status-appveyor

Mark-Simulacrum · 2017-07-26T18:42:58Z

@bors retry - RLS failure (again, despite attempted fix) - #43453

[01:46:09] test build::cargo::test::test_dedup_flags ... ok
[01:46:09] test server::test::server_message_get_method_name ... ok
[01:46:09] test server::test::server_message_to_str ... ok
[01:46:10] error[E0422]: cannot find struct, variant or union type `LibCfgTestStruct` in module `bin_lib_no_cfg_test`
[01:46:10]  --> test_data\bin_lib_no_cfg_test\src\main.rs:5:37
[01:46:10]   |
[01:46:10] 5 |     let test = bin_lib_no_cfg_test::LibCfgTestStruct { };
[01:46:10]   |                                     ^^^^^^^^^^^^^^^^ not found in `bin_lib_no_cfg_test`
[01:46:10]
[01:46:11] test test::test_bin_lib_project ... ok
[01:46:11] test test::test_borrow_error ... ok
[01:46:12] test test::test_completion ... ok
[01:46:12] test test::test_find_all_refs ... ok
[01:46:13] test test::test_find_all_refs_no_cfg_test ... ok
[01:46:13] test test::test_multiple_binaries ... ok
[01:46:13] test test::test_parse_error_on_malformed_input ... ok
[01:46:14] test test::test_reformat ... ok
[01:46:14] test test::test_reformat_with_range ... ok
[01:46:15] test test::test_simple_workspace ... ok
[01:46:19] test test::test_bin_lib_project_no_cfg_test ... FAILED
[01:46:19]
[01:46:19] failures:
[01:46:19]
[01:46:19] ---- test::test_bin_lib_project_no_cfg_test stdout ----
[01:46:19]  thread 'test::test_bin_lib_project_no_cfg_test' panicked at 'Hit timeout', src\tools\rls\src\test\harness.rs:142:12

cc @nrc

bors · 2017-07-26T21:08:44Z

⌛ Testing commit 959ebd6 with merge 599be0d...

Rollup of 10 pull requests - Successful merges: #42959, #43447, #43455, #43456, #43458, #43462, #43463, #43465, #43471, #43480 - Failed merges:

bors · 2017-07-26T23:40:44Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 599be0d to master...

SimonSapin and others added 30 commits July 22, 2017 20:37

Add new_checked(…) -> Option<Self> to NonZero, Unique, and Shared.

e9af03a

Rename {NonZero,Shared,Unique}::new to new_unchecked

0a08ad0

Rename {NonZero,Shared,Unique}::new_checked to new

ddaf9b2

Implement From<Unique<T>> for Shared<T>

1ef24bb

Add Box::into_unique

cbd2b6b

Add conversions from references to NonZero pointers, Unique, and Shared

a4edae9

Use checked NonZero constructor instead of explicit null check in btree

938552a

Use checked NonZero constructor in obligation forest NodeIndex

13d17ad

… to remove an `unsafe` block.

Use checked NonZero constructor in MIR move path indices

06e130f

… to protect against UB in the unlikely case that `idx + 1` overflows.

Use safe conversion instead of unsafe constructor in issue-23433 test

1ba8b15

Fix unstable feature name for some impls for Unique<T>

f732911

Don’t create NonZero(0) in test/ui/print_type_sizes/nullable.rs

ff7f220

Remove unnecessary unsafe in test/ui/print_type_sizes/nullable.rs

0d1864b

std::thread::spawn: Fix grammar in documentation

8aa8f80

Fix printing regions with -Z verbose

95b0f22

DNS functions are in libresolv on Solaris, just like on MacOS

ea23e50

avoid printing 'static

4e1249d

Fix the spans of catch blocks to include the do

5388470

Add tests for issues with the E-needstest label

04aa5c1

Add missing impl and tests for int to int TryFrom impls

9ea65a8

add a note to Vec's Extend<&T> impl about its slice specialization

6e36769

Constrain the layout of Blake2bCtx for proper SPARC compilation

f0fda53

On SPARC, optimization fuel ends up emitting incorrect load and store instructions for the transmute() call in blake2b_compress(). If we force Blake2bCtx to be repr(C), the problem disappears. Fixes rust-lang#43346

Rollup merge of rust-lang#43456 - joshlf:spawn-doc-grammar, r=alexcri…

25e5f0a

…chton std::thread::spawn: Fix grammar in documentation Closes rust-lang#43435.

Rollup merge of rust-lang#43462 - dhduvall:solaris-libresolv, r=aturon

9d02019

DNS functions are in libresolv on Solaris, just like on MacOS

Rollup merge of rust-lang#43463 - nrc:catch-span, r=petrochenkov

f7d06b3

Fix the spans of catch blocks to include the `do`

Mark-Simulacrum added 3 commits July 26, 2017 06:15

Rollup merge of rust-lang#43471 - ollie27:try_from_ints, r=nagisa

ed09d6d

Add missing impl and tests for int to int TryFrom impls These were missing from rust-lang#43248. r? @nagisa

rust-highfive assigned BurntSushi Jul 26, 2017

bors added a commit that referenced this pull request Jul 26, 2017

Auto merge of #43487 - Mark-Simulacrum:rollup, r=Mark-Simulacrum

599be0d

Rollup of 10 pull requests - Successful merges: #42959, #43447, #43455, #43456, #43458, #43462, #43463, #43465, #43471, #43480 - Failed merges:

bors merged commit 959ebd6 into rust-lang:master Jul 26, 2017

This was referenced Jul 26, 2017

Implement From<&[T]> and others for Arc/Rc (RFC 1845) #42565

Merged

syntax: Simplify parsing of paths #43438

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 10 pull requests#43487