Rollup of 14 pull requests #76912

RalfJung · 2020-09-19T09:47:58Z

Successful merges:

deny(unsafe_op_in_unsafe_fn) in libstd/path.rs #73963 (deny(unsafe_op_in_unsafe_fn) in libstd/path.rs)
lint/ty: move fns to avoid abstraction violation #75099 (lint/ty: move fns to avoid abstraction violation)
Use implicit (not explicit) rules for promotability by default in const fn #75502 (Use implicit (not explicit) rules for promotability by default in const fn)
Add test for checking duplicated branch or-patterns #75580 (Add test for checking duplicated branch or-patterns)
Add [T; N]: TryFrom<Vec<T>> (insta-stable) #76310 (Add [T; N]: TryFrom<Vec<T>> (insta-stable))
Clean up vec benches bench_in_place style #76400 (Clean up vec benches bench_in_place style)
do not inline black_box when building for Miri #76434 (do not inline black_box when building for Miri)
Add associated constant BITS to all integer types #76492 (Add associated constant BITS to all integer types)
Add as_str() to string::Drain. #76525 (Add as_str() to string::Drain.)
assert ScalarMaybeUninit size #76636 (assert ScalarMaybeUninit size)
give *even better* suggestion when matching a const range #76749 (give even better suggestion when matching a const range)
don't convert types to the same type with try_into (clippy::useless_conversion) #76757 (don't convert types to the same type with try_into (clippy::useless_conversion))
Give a better error message when x.py uses the wrong stage for CI #76796 (Give a better error message when x.py uses the wrong stage for CI)
Build fixes for RISC-V 32-bit Linux support #76798 (Build fixes for RISC-V 32-bit Linux support)

Failed merges:

This commit moves `transparent_newtype_field` and `is_zst` to `LateContext` where they are used, rather than being on the `VariantDef` and `TyS` types. Signed-off-by: David Wood <david@davidtw.co>

This is very similar to the existing `Box<[T; N]>: TryFrom<Box<[T]>>`, but allows avoiding the `shrink_to_fit` if you have a vector and not a boxed slice.

Thanks, Amanieu Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

…here possible

Co-authored-by: Ivan Tham <pickfire@riseup.net>

Trait implementations effectively can't be #[unstable].

Since trait implementations cannot be unstable, we should only add them when the as_str feature gets stabilized. Until then, only `.as_str()` is available (behind a feature gate).

…onversion)

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

…ts (clippy::unnecessary_lazy_evaluations)

…acrum deny(unsafe_op_in_unsafe_fn) in libstd/path.rs The libstd/path.rs part of rust-lang#73904 . Wraps the two calls to an unsafe fn Initializer::nop() in an unsafe block.

@eddyb

…ion, r=eddyb lint/ty: move fns to avoid abstraction violation This PR moves `transparent_newtype_field` and `is_zst` to `LateContext` where they are used, rather than being on the `VariantDef` and `TyS` types, hopefully addressing @eddyb's concern [from this comment](rust-lang#74340 (comment)).

…n-const-fn, r=RalfJung Use implicit (not explicit) rules for promotability by default in `const fn` For crater run. See rust-lang/const-eval#54 (comment). cc rust-lang#75586

@lzutao

Add test for checking duplicated branch or-patterns This adds a regression test for checking `or-patterns` in MIR as shown in rust-lang#75439. This doesn't introduce a fix as I'm not sure where it would go(I suspect maybe here: src/librustc_mir_build/build/matches/mod.rs), and I'm not particularly able to fix it. cc: @lzutao

Add `[T; N]: TryFrom<Vec<T>>` (insta-stable) This is very similar to the [existing](https://doc.rust-lang.org/nightly/std/convert/trait.TryFrom.html#impl-TryFrom%3CBox%3C%5BT%5D%3E%3E) `Box<[T; N]>: TryFrom<Box<[T]>>`, but allows avoiding the `shrink_to_fit` if you have a vector and not a boxed slice. Like the slice equivalents of this, it fails if the length of the vector is not exactly `N`. This uses `Vec<T>` as the `Error` type to return the input, like how the `Rc<[T]> -> Rc<[T; N]>` (and Arc) ones also reflect the input directly in the error type. ```rust #[stable(feature = "array_try_from_vec", since = "1.47.0")] impl<T, const N: usize> TryFrom<Vec<T>> for [T; N] { type Error = Vec<T>; fn try_from(mut vec: Vec<T>) -> Result<[T; N], Vec<T>>; } ``` Inspired by this zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/APIs.20for.20getting.20stuff.20from.20a.20Vec.20by.20owned/near/209048103

Clean up vec benches bench_in_place style

do not inline black_box when building for Miri We cannot do the assembly trick in Miri, but let's at least make sure MIR inlining does not circumvent the black_box. Also use black_box instead of local optimization barriers in a few const tests.

…r=dtolnay Add associated constant `BITS` to all integer types Recently I've regularly come across this snippet (in a few different crates, including `core` and `std`): ```rust std::mem::size_of<usize>() * 8 ``` I think it's time for a `usize::BITS`.

…in, r=dtolnay Add as_str() to string::Drain. Vec's Drain recently [had its `.as_slice()` stabilized](rust-lang#72584), but String's Drain was still missing the analogous `.as_str()`. This adds that. Also improves the Debug implementation, which now shows the remaining data instead of just `"Drain { .. }"`.

@oli-obk

assert ScalarMaybeUninit size I noticed most low-level Miri types have such an assert but `ScalarMaybeUninit` does not, so let's add that. Good t see that the `Option`-like optimization kicks in and this is no bigger than `Scalar`. :) r? @oli-obk

@estebank

give *even better* suggestion when matching a const range notice that the err already has "constant defined here" so this is now *exceedingly clear* extension to rust-lang#76222 r? @estebank

don't convert types to the same type with try_into (clippy::useless_conversion)

@shepmaster

Give a better error message when x.py uses the wrong stage for CI r? @shepmaster

…yn514 Build fixes for RISC-V 32-bit Linux support This fixes build issues with the 32-bit RISC-V port.

RalfJung · 2020-09-19T09:49:25Z

@rustbot modify labels: +rollup
@bors r+ rollup=never p=14

bors · 2020-09-19T09:49:26Z

📌 Commit b4c3f40 has been approved by RalfJung

RalfJung · 2020-09-19T09:51:03Z

Cc @Dylan-DPC (just realized I might not be at a computer when this runs, so if it fails would be good if you could take a look)

bors · 2020-09-19T11:29:06Z

⌛ Testing commit b4c3f40 with merge 8e9d5db...

bors · 2020-09-19T13:31:15Z

☀️ Test successful - checks-actions, checks-azure
Approved by: RalfJung
Pushing 8e9d5db to master...

hellow554 and others added 30 commits August 11, 2020 09:22

deny(unsafe_op_in_unsafe_fn) in libstd/path.rs

00d537d

lint/ty: move fns to avoid abstraction violation

0f2bd56

This commit moves `transparent_newtype_field` and `is_zst` to `LateContext` where they are used, rather than being on the `VariantDef` and `TyS` types. Signed-off-by: David Wood <david@davidtw.co>

Add [T; N]: TryFrom<Vec<T>>

6092828

This is very similar to the existing `Box<[T; N]>: TryFrom<Box<[T]>>`, but allows avoiding the `shrink_to_fit` if you have a vector and not a boxed slice.

Add test for checking if-let or-patterns

6cb6716

Nightly is currently 1.48

2c8a4c8

Clean up vec benches bench_in_place style

685f042

Typo fix

3d89ee9

Thanks, Amanieu Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>

do not inline black_box when building for Miri

caeb554

use black_box instead of local optimziation barriers in const tests w…

4b5cd54

…here possible

Separate feature flags

47668ed

Co-authored-by: Ivan Tham <pickfire@riseup.net>

add missing feature flag

284b169

Add as_str() and AsRef to string::Drain.

daa62d9

Show remaining data in string::Drain's Debug impl.

6732840

Add AsRef<[u8]> for String's Drain.

f5bb523

Mark AsRef impls for String's Drain as stable.

f2a3290

Trait implementations effectively can't be #[unstable].

Disable AsRef implementations for String's Drain.

829019d

Since trait implementations cannot be unstable, we should only add them when the as_str feature gets stabilized. Until then, only `.as_str()` is available (behind a feature gate).

also assert ScalarMaybeUninit size

91f7d76

don't convert types to the same type with try_into (clippy::useless_c…

f567287

…onversion)

library/panic_unwind: Add UNWIND_DATA_REG for RISC-V 32-bit

de0d55c

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

library/std: linux: Add support for RISC-V 32-bit

84fe26c

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

library/std: raw: Add support for RISC-V 32-bit

cd066c9

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

library/std: sys_common: Add support for RISC-V 32-bit

cf07535

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

library/unwind: Add support for RISC-V 32-bit

0f3ccbd

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

Give a better error message when x.py uses the wrong stage for CI

be37265

tools/build-manifest: Add support for RISC-V 32-bit

3e94295

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

give better suggestion when matching a const range

1d93048

comments and factor to own method

230355f

library/panic_unwind: Consolidate RV32 and RV64

fd76268

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

library/unwind: Consolidate RV32 and RV64

57b2da8

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

don't lazily evaulate some trivial values for Option::None replacemen…

0e34142

…ts (clippy::unnecessary_lazy_evaluations)

m-ou-se and others added 15 commits September 19, 2020 08:23

Add tracking issue number for string_drain_as_str.

15eb638

Rollup merge of rust-lang#73963 - hellow554:unsafe_path, r=Mark-Simul…

44be933

…acrum deny(unsafe_op_in_unsafe_fn) in libstd/path.rs The libstd/path.rs part of rust-lang#73904 . Wraps the two calls to an unsafe fn Initializer::nop() in an unsafe block.

Rollup merge of rust-lang#75502 - ecstatic-morse:implicit-promotion-i…

f62ba52

…n-const-fn, r=RalfJung Use implicit (not explicit) rules for promotability by default in `const fn` For crater run. See rust-lang/const-eval#54 (comment). cc rust-lang#75586

Rollup merge of rust-lang#76400 - pickfire:patch-5, r=dtolnay

67fa7b7

Clean up vec benches bench_in_place style

Rollup merge of rust-lang#76749 - guswynn:hir_ranges, r=estebank

5631b5d

give *even better* suggestion when matching a const range notice that the err already has "constant defined here" so this is now *exceedingly clear* extension to rust-lang#76222 r? @estebank

Rollup merge of rust-lang#76757 - matthiaskrgr:clippy_try_into, r=lcnr

4831523

don't convert types to the same type with try_into (clippy::useless_conversion)

Rollup merge of rust-lang#76796 - jyn514:wrong-stage, r=shepmaster

404cce0

Give a better error message when x.py uses the wrong stage for CI r? @shepmaster

Rollup merge of rust-lang#76798 - alistair23:alistair/rv32-linux, r=j…

b4c3f40

…yn514 Build fixes for RISC-V 32-bit Linux support This fixes build issues with the 32-bit RISC-V port.

rustbot added the rollup A PR which is a rollup label Sep 19, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 19, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 19, 2020

bors merged commit 8e9d5db into rust-lang:master Sep 19, 2020

rustbot added this to the 1.48.0 milestone Sep 19, 2020

This was referenced Sep 19, 2020

Split core/num/mod.rs to smaller mods #76327

Merged

Split up core/test/iter.rs into multiple files #76391

Merged

Some promotion cleanup #76411

Merged

RalfJung deleted the rollup-q9ur56h branch September 19, 2020 20:23

SNCPlay42 mentioned this pull request Oct 5, 2020

Previously working code doesn't work on nightly (zero-sized types) #77563

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 14 pull requests #76912

Rollup of 14 pull requests #76912

RalfJung commented Sep 19, 2020

RalfJung commented Sep 19, 2020

bors commented Sep 19, 2020

RalfJung commented Sep 19, 2020

bors commented Sep 19, 2020

bors commented Sep 19, 2020

Rollup of 14 pull requests #76912

Rollup of 14 pull requests #76912

Conversation

RalfJung commented Sep 19, 2020

RalfJung commented Sep 19, 2020

bors commented Sep 19, 2020

RalfJung commented Sep 19, 2020

bors commented Sep 19, 2020

bors commented Sep 19, 2020