Rollup of 13 pull requests #76907

RalfJung · 2020-09-19T07:50:00Z

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)
Add test for checking duplicated branch or-patterns #75580 (Add test for checking duplicated branch or-patterns)
Stabilize some Option methods as const #76135 (Stabilize some Option methods as const)
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)
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>

Stabilize the following methods of `Option` as const: - `is_some` - `is_none` - `as_ref` Possible because of stabilization of rust-lang#49146 (Allow if and match in constants).

Part of rust-lang#76268

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>

…onversion)

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

…ts (clippy::unnecessary_lazy_evaluations)

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

…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)).

@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

Stabilize some Option methods as const Stabilize the following methods of `Option` as const: - `is_some` - `is_none` - `as_ref` These methods are currently const under the unstable feature `const_option` (tracking issue: rust-lang#67441). I believe these methods to be eligible for stabilization because of the stabilization of rust-lang#49146 (Allow if and match in constants) and the trivial implementations, see also: [PR#75463](rust-lang#75463). Related: rust-lang#76225

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`.

@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-19T07:52:16Z

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

bors · 2020-09-19T07:52:17Z

📌 Commit 72ff47c has been approved by RalfJung

bors · 2020-09-19T08:37:33Z

⌛ Testing commit 72ff47c with merge 5b777cd9322a036c403c9b889c702a6afd60da63...

bors · 2020-09-19T09:21:16Z

💔 Test failed - checks-actions

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>

Stabilize some Option methods as const

db109c6

Stabilize the following methods of `Option` as const: - `is_some` - `is_none` - `as_ref` Possible because of stabilization of rust-lang#49146 (Allow if and match in constants).

Move const tests for Option to library\core

04e4a39

Part of rust-lang#76268

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

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)

library/unwind: Add missing )

3d1b6d6

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

Add BITS associated constant to all integer types.

3f68ae4

Add example/test to <int types>::BITS.

5c30a16

m-ou-se and others added 15 commits September 19, 2020 06:54

Use T::BITS instead of size_of::<T> * 8.

1e2dba1

Add tracking issue number for int_bits_const.

1bfe5ef

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

651415a

…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#76400 - pickfire:patch-5, r=dtolnay

0d80a97

Clean up vec benches bench_in_place style

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

30e8ec6

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

141ba48

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

10c1ddb

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…

72ff47c

…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 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 Sep 19, 2020

RalfJung mentioned this pull request Sep 19, 2020

Stabilize some Option methods as const #76135

Merged

RalfJung closed this Sep 19, 2020

RalfJung deleted the rollup-lb8lulf branch September 19, 2020 09:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 13 pull requests #76907

Rollup of 13 pull requests #76907

RalfJung commented Sep 19, 2020

RalfJung commented Sep 19, 2020

bors commented Sep 19, 2020

bors commented Sep 19, 2020

bors commented Sep 19, 2020

Rollup of 13 pull requests #76907

Rollup of 13 pull requests #76907

Conversation

RalfJung commented Sep 19, 2020

RalfJung commented Sep 19, 2020

bors commented Sep 19, 2020

bors commented Sep 19, 2020

bors commented Sep 19, 2020