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

Fix call-generic-method-nonconst test

Browse Source
This commit is contained in:
Deadbeef 2021-07-26 12:06:55 +08:00
parent 7106f8d8ee
commit 6b6ad781f8
No known key found for this signature in database
GPG Key ID: 027DF9338862ADDD
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_hir/src/hir.rs
View File

@ -3261,7 +3261,7 @@ pub fn hir_id(&self) -> Option<HirId> {
}
}
/// Returns `Constness::Const` when this node is a const fn/impl.
/// Returns `Constness::Const` when this node is a const fn/impl/item.
pub fn constness(&self) -> Constness {
match self {
Node::Item(Item {
@ -3278,6 +3278,10 @@ pub fn constness(&self) -> Constness {
})
| Node::Item(Item { kind: ItemKind::Impl(Impl { constness, .. }), .. }) => *constness,
Node::Item(Item { kind: ItemKind::Const(..), .. })
| Node::TraitItem(TraitItem { kind: TraitItemKind::Const(..), .. })
| Node::ImplItem(ImplItem { kind: ImplItemKind::Const(..), .. }) => Constness::Const,
_ => Constness::NotConst,
}
}

4
src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.rs
View File

@ -1,7 +1,5 @@
// FIXME(jschievink): this is not rejected correctly (only when the non-const impl is actually used)
// ignore-test
#![feature(const_trait_impl)]
#![feature(const_fn_trait_bound)]
struct S;

14
src/test/ui/rfc-2632-const-trait-impl/call-generic-method-nonconst.stderr Normal file
View File

@ -0,0 +1,14 @@
error[E0277]: can't compare `S` with `S`
--> $DIR/call-generic-method-nonconst.rs:19:34
|
LL | const fn equals_self<T: PartialEq>(t: &T) -> bool {
| --------- required by this bound in `equals_self`
...
LL | pub const EQ: bool = equals_self(&S);
| ^^ no implementation for `S == S`
|
= help: the trait `PartialEq` is not implemented for `S`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0277`.