mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #119962 - GuillaumeGomez:rollup-mj7agm6, r=GuillaumeGomez

Browse Source 
Rollup of 3 pull requests

Successful merges:

 - #119944 (Don't ICE when noting GAT bounds in `report_no_match_method_error`)
 - #119949 (Add note on SpecOptionPartialEq to `newtype_index`)
 - #119961 ([meta] Remove Zulip rustdoc nomination alert)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2024-01-14 17:13:30 +00:00
commit 273035458d
6 changed files with 100 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_hir_typeck/src/method/suggest.rs
View File

@ -825,11 +825,16 @@ pub fn report_no_match_method_error(
"auto trait is invoked with no method error, but no error reported?",
);
}
Some(Node::Item(hir::Item {
ident,
kind: hir::ItemKind::Trait(..) | hir::ItemKind::TraitAlias(..),
..
})) => {
Some(
Node::Item(hir::Item {
ident,
kind: hir::ItemKind::Trait(..) | hir::ItemKind::TraitAlias(..),
..
})
// We may also encounter unsatisfied GAT or method bounds
| Node::TraitItem(hir::TraitItem { ident, .. })
| Node::ImplItem(hir::ImplItem { ident, .. }),
) => {
skip_list.insert(p);
let entry = spanned_predicates.entry(ident.span);
let entry = entry.or_insert_with(|| {
@ -840,7 +845,7 @@ pub fn report_no_match_method_error(
entry.1.insert((cause_span, "unsatisfied trait bound introduced here"));
entry.2.push(p);
}
Some(node) => unreachable!("encountered `{node:?}`"),
Some(node) => unreachable!("encountered `{node:?}` due to `{cause:#?}`"),
None => (),
}
}

3
compiler/rustc_index_macros/src/lib.rs
View File

@ -31,6 +31,9 @@
/// - `#[max = 0xFFFF_FFFD]`: specifies the max value, which allows niche
/// optimizations. The default max value is 0xFFFF_FF00.
/// - `#[gate_rustc_only]`: makes parts of the generated code nightly-only.
///
/// `SpecOptionPartialEq` is specialized by this macro, so using it requires enabling
/// `#![feature(min_specialization)]` for the crate.
#[proc_macro]
#[cfg_attr(
feature = "nightly",

1
library/core/src/option.rs
View File

@ -2147,6 +2147,7 @@ fn eq(&self, other: &Self) -> bool {
///
/// Once that's fixed, `Option` should go back to deriving `PartialEq`, as
/// it used to do before <https://github.com/rust-lang/rust/pull/103556>.
/// The comment regarding this trait on the `newtype_index` macro should be removed if this is done.
#[unstable(feature = "spec_option_partial_eq", issue = "none", reason = "exposed only for rustc")]
#[doc(hidden)]
pub trait SpecOptionPartialEq: Sized {

33
tests/ui/generic-associated-types/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.rs Normal file
View File

@ -0,0 +1,33 @@
use std::ops::Deref;
trait PointerFamily {
type Pointer<T>: Deref<Target = T>;
}
struct RcFamily;
impl PointerFamily for RcFamily {
type Pointer<T> = dyn Deref<Target = T>;
//~^ ERROR the size for values of type `(dyn Deref<Target = T> + 'static)` cannot be known at compilation time
}
enum Node<T, P: PointerFamily> {
Cons(T, P::Pointer<Node<T, P>>),
Nil,
}
type RcNode<T> = Node<T, RcFamily>;
impl<T, P: PointerFamily> Node<T, P>
where
P::Pointer<Node<T, P>>: Sized,
{
fn new() -> P::Pointer<Self> {
todo!()
}
}
fn main() {
let mut list = RcNode::<i32>::new();
//~^ ERROR the size for values of type `Node<i32, RcFamily>` cannot be known at compilation time
}

52
tests/ui/generic-associated-types/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.stderr Normal file
View File

@ -0,0 +1,52 @@
error[E0277]: the size for values of type `(dyn Deref<Target = T> + 'static)` cannot be known at compilation time
--> $DIR/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.rs:10:23
|
LL | type Pointer<T> = dyn Deref<Target = T>;
| ^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
|
= help: the trait `Sized` is not implemented for `(dyn Deref<Target = T> + 'static)`
note: required by a bound in `PointerFamily::Pointer`
--> $DIR/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.rs:4:5
|
LL | type Pointer<T>: Deref<Target = T>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `PointerFamily::Pointer`
help: consider relaxing the implicit `Sized` restriction
|
LL | type Pointer<T>: Deref<Target = T> + ?Sized;
| ++++++++
error[E0599]: the size for values of type `Node<i32, RcFamily>` cannot be known at compilation time
--> $DIR/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.rs:31:35
|
LL | enum Node<T, P: PointerFamily> {
| ------------------------------
| |
| variant or associated item `new` not found for this enum
| doesn't satisfy `Node<i32, RcFamily>: Sized`
...
LL | let mut list = RcNode::<i32>::new();
| ^^^ doesn't have a size known at compile-time
--> $SRC_DIR/core/src/ops/deref.rs:LL:COL
|
= note: doesn't satisfy `_: Sized`
|
note: trait bound `Node<i32, RcFamily>: Sized` was not satisfied
--> $DIR/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.rs:4:18
|
LL | type Pointer<T>: Deref<Target = T>;
| ------- ^ unsatisfied trait bound introduced here
note: trait bound `(dyn Deref<Target = Node<i32, RcFamily>> + 'static): Sized` was not satisfied
--> $DIR/issue-119942-unsatisified-gat-bound-during-assoc-ty-selection.rs:23:29
|
LL | impl<T, P: PointerFamily> Node<T, P>
| ----------
LL | where
LL | P::Pointer<Node<T, P>>: Sized,
| ^^^^^ unsatisfied trait bound introduced here
note: the trait `Sized` must be implemented
--> $SRC_DIR/core/src/marker.rs:LL:COL
error: aborting due to 2 previous errors
Some errors have detailed explanations: E0277, E0599.
For more information about an error, try `rustc --explain E0277`.

9
triagebot.toml
View File

@ -389,15 +389,6 @@ message_on_remove = "Issue #{number}'s prioritization request has been removed."
message_on_close = "Issue #{number} has been closed while requested for prioritization."
message_on_reopen = "Issue #{number} has been reopened."
[notify-zulip."T-rustdoc"]
required_labels = ["I-nominated"]
zulip_stream = 266220 # #rustdoc
topic = "nominated: #{number}"
message_on_add = """\
@*T-rustdoc* issue #{number} "{title}" has been nominated for `T-rustdoc` discussion.
"""
message_on_remove = "Issue #{number}'s nomination request has been removed."
[notify-zulip."I-types-nominated"]
zulip_stream = 326866 # #T-types/nominated
topic = "#{number}: {title}"