Rollup of 7 pull requests #95572

matthiaskrgr · 2022-04-01T21:22:15Z

Successful merges:

Make GATs object safe under generic_associated_types_extended feature #94911 (Make GATs object safe under generic_associated_types_extended feature)
Handle rustc_const_stable attribute in library feature collector #95354 (Handle rustc_const_stable attribute in library feature collector)
invalid_value lint: detect invalid initialization of arrays #95373 (invalid_value lint: detect invalid initialization of arrays)
Add error message suggestion for missing noreturn in naked function #95544 (Add error message suggestion for missing noreturn in naked function)
Implement provenance preserving methods on NonNull #95556 (Implement provenance preserving methods on NonNull)
Fix thread_local! macro to be compatible with no_implicit_prelude #95557 (Fix thread_local! macro to be compatible with no_implicit_prelude)
small type system refactoring #95559 (small type system refactoring)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

**Description** Add the `addr`, `with_addr, `map_addr` methods to the `NonNull` type, and map the address type to `NonZeroUsize`. **Motiviation** The `NonNull` type is useful for implementing pointer types which have the 0-niche. It is currently possible to implement these provenance preserving functions by calling `NonNull::as_ptr` and `new_unchecked`. The addition of these methods simply make it more ergonomic to use. **Testing** Added a unit test of a nonnull tagged pointer type. This is based on some real code I have elsewhere, that currently routes the pointer through a `NonZeroUsize` and back out to produce a usable pointer.

Fixes issue rust-lang#95533

…r-errors Make GATs object safe under generic_associated_types_extended feature Based on rust-lang#94869 Let's say we have ```rust trait StreamingIterator { type Item<'a> where Self: 'a; } ``` And `dyn for<'a> StreamingIterator<Item<'a> = &'a i32>`. If we ask `(dyn for<'a> StreamingIterator<Item<'a> = &'a i32>): StreamingIterator`, then we have to prove that `for<'x> (&'x i32): Sized`. So, we generate *new* bound vars to subst for the GAT generics. Importantly, this doesn't fully verify that these are usable and sound. r? `@nikomatsakis`

Handle rustc_const_stable attribute in library feature collector The library feature collector in [compiler/rustc_passes/src/lib_features.rs](https://github.com/rust-lang/rust/blob/551b4fa395fa588d91cbecfb0cdfe1baa02670cf/compiler/rustc_passes/src/lib_features.rs) has only been looking at `#[stable(…)]`, `#[unstable(…)]`, and `#[rustc_const_unstable(…)]` attributes, while ignoring `#[rustc_const_stable(…)]`. The consequences of this were: - When any const feature got stabilized (changing one or more `rustc_const_unstable` to `rustc_const_stable`), users who had previously enabled that unstable feature using `#![feature(…)]` would get told "unknown feature", rather than rustc's nicer "the feature … has been stable since … and no longer requires an attribute to enable". This can be seen in the way that rust-lang#93957 (comment) failed after rebase: ```console error[E0635]: unknown feature `const_ptr_offset` --> $DIR/offset_from_ub.rs:1:35 | LL | #![feature(const_ptr_offset_from, const_ptr_offset)] | ^^^^^^^^^^^^^^^^ ``` - We weren't enforcing that a particular feature is either stable everywhere or unstable everywhere, and that a feature that has been stabilized has the same stabilization version everywhere, both of which we enforce for the other stability attributes. This PR updates the library feature collector to handle `rustc_const_stable`, and fixes places in the standard library and test suite where `rustc_const_stable` was being used in a way that does not meet the rules for a stability attribute.

invalid_value lint: detect invalid initialization of arrays

…iagnostic, r=tmiasko Add error message suggestion for missing noreturn in naked function I had to google the syntax for inline asm's `noreturn` option when I got this error earlier today, so I figured I'd save others the trouble and add the syntax/fix as a suggestion in the error.

Implement provenance preserving methods on NonNull ### Description Add the `addr`, `with_addr`, `map_addr` methods to the `NonNull` type, and map the address type to `NonZeroUsize`. ### Motivation The `NonNull` type is useful for implementing pointer types which have the 0-niche. It is currently possible to implement these provenance preserving functions by calling `NonNull::as_ptr` and `new_unchecked`. The adding these methods makes it more ergonomic. ### Testing Added a unit test of a non-null tagged pointer type. This is based on some real code I have elsewhere, that currently routes the pointer through a `NonZeroUsize` and back out to produce a usable pointer. I wanted to produce an ideal version of the same tagged pointer struct that preserved pointer provenance. ### Related Extension of APIs proposed in rust-lang#95228 . I can also split this out into a separate tracking issue if that is better (though I may need some pointers on how to do that).

Fix `thread_local!` macro to be compatible with `no_implicit_prelude` Fixes issue rust-lang#95533.

small type system refactoring

matthiaskrgr · 2022-04-01T21:22:29Z

@bors r+ rollup=never p=7

bors · 2022-04-01T21:22:30Z

📌 Commit b0cc70b has been approved by matthiaskrgr

bors · 2022-04-01T23:41:49Z

⌛ Testing commit b0cc70b with merge ef72b1a83ab3d0c839ad57f4a69ae342c4c100f6...

rust-log-analyzer · 2022-04-02T00:04:42Z

The job x86_64-gnu-nopt failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


---- [ui (nll)] ui/generic-associated-types/trait-objects.rs#extended stdout ----
diff of stderr:

- error[E0621]: explicit lifetime required in the type of `x`
-   --> $DIR/trait-objects.rs:16:7
+ error[E0521]: borrowed data escapes outside of function
3    |
3    |
4 LL | fn min_size(x: &mut dyn for<'a> StreamingIterator<Item<'a> = &'a i32>) -> usize {
-    |                ------------------------------------------------------ help: add explicit lifetime `'a` to the type of `x`: `&'a mut (dyn StreamingIterator<for<'a> Item = &'a i32> + 'a)`
+    |             -  - let's call the lifetime of this reference `'1`
+    |             |
+    |             `x` is a reference that is only valid in the function body
7 LL |     x.size_hint().0
7 LL |     x.size_hint().0
-    |       ^^^^^^^^^ lifetime `'a` required
+    |     |
+    |     |
+    |     `x` escapes the function body here
+    |     argument requires that `'1` must outlive `'static`
10 error: aborting due to previous error
11 

- For more information about this error, try `rustc --explain E0621`.
- For more information about this error, try `rustc --explain E0621`.
+ For more information about this error, try `rustc --explain E0521`.
13 


The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generic-associated-types/trait-objects.extended.nll/trait-objects.extended.nll.stderr
To only update this specific test, also pass `--test-args generic-associated-types/trait-objects.rs`


Some tests failed in compiletest suite=ui compare_mode=Nll mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
error in revision `extended`: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/generic-associated-types/trait-objects.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "extended" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generic-associated-types/trait-objects.extended.nll" "-Zborrowck=mir" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/generic-associated-types/trait-objects.extended.nll/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0521]: borrowed data escapes outside of function
   |
   |
LL | fn min_size(x: &mut dyn for<'a> StreamingIterator<Item<'a> = &'a i32>) -> usize {
   |             -  - let's call the lifetime of this reference `'1`
   |             |
   |             `x` is a reference that is only valid in the function body
LL |     //[base]~^ the trait `StreamingIterator` cannot be made into an object
LL |     x.size_hint().0
   |     |
   |     |
   |     `x` escapes the function body here
   |     argument requires that `'1` must outlive `'static`
error: aborting due to previous error

For more information about this error, try `rustc --explain E0521`.
------------------------------------------

bors · 2022-04-02T00:05:38Z

💔 Test failed - checks-actions

dtolnay and others added 20 commits March 31, 2022 12:34

Handle rustc_const_stable attribute in library feature collector

5d30180

Adjust feature names that disagree on const stabilization version

4246916

Adjust MaybeUninit feature names to avoid changing unstable one

3c8e7b9

Fix feature name of stable parts of strict_provenance

971ecff

Add error message suggestion for missing noreturn in naked function

b657cb5

Fix thread_local! macro to be compatible with no_implicit_prelude

1f232b8

Fixes issue rust-lang#95533

update comments

18fae7b

remove unify_key::replace_if_possible

c2b5a7e

remove unused incorrect EqUnifyValue impl

389c83b

invalid_value lint: detect invalid initialization of arrays

af24588

Make GATs object safe under generic_associated_types_extended feature

d3fe28b

Reword purpose description of noreturn in naked function

f793b69

Rollup merge of rust-lang#95373 - RalfJung:invalid_value, r=davidtwco

67f9ce4

invalid_value lint: detect invalid initialization of arrays

Rollup merge of rust-lang#95557 - niluxv:issue-95533, r=dtolnay

ebd42a8

Fix `thread_local!` macro to be compatible with `no_implicit_prelude` Fixes issue rust-lang#95533.

Rollup merge of rust-lang#95559 - lcnr:inferctxt-typeck, r=oli-obk

b0cc70b

small type system refactoring

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 1, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 1, 2022

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 Apr 2, 2022

Dylan-DPC mentioned this pull request Apr 2, 2022

Make GATs object safe under generic_associated_types_extended feature #94911

Merged

Dylan-DPC closed this Apr 2, 2022

matthiaskrgr deleted the rollup-g1qdasf branch July 30, 2022 10:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests #95572

Rollup of 7 pull requests #95572

Uh oh!

matthiaskrgr commented Apr 1, 2022

Uh oh!

matthiaskrgr commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

rust-log-analyzer commented Apr 2, 2022

Uh oh!

bors commented Apr 2, 2022

Uh oh!

Uh oh!

Rollup of 7 pull requests #95572

Rollup of 7 pull requests #95572

Uh oh!

Conversation

matthiaskrgr commented Apr 1, 2022

Uh oh!

matthiaskrgr commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

bors commented Apr 1, 2022

Uh oh!

rust-log-analyzer commented Apr 2, 2022

Uh oh!

bors commented Apr 2, 2022

Uh oh!

Uh oh!