dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delegation: fix ICE on wrong instantiation

This commit is contained in:
Bryanskiy 2024-03-26 18:59:03 +03:00
parent 10a7aa14fe
commit 0cd9708de6
21 changed files with 238 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
View File

@ -2212,6 +2212,17 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
try_emit("delegation with early bound generics");
}
// There is no way to instantiate `Self` param for caller if
// 1. callee is a trait method
// 2. delegation item isn't an associative item
if let DefKind::AssocFn = self.tcx().def_kind(sig_id)
&& let DefKind::Fn = self.tcx().def_kind(self.item_def_id())
&& self.tcx().associated_item(sig_id).container
== ty::AssocItemContainer::TraitContainer
{
try_emit("delegation to a trait method from a free function");
}
if self.tcx().asyncness(sig_id) == ty::Asyncness::Yes {
try_emit("delegation to async functions");
}

10
tests/ui/delegation/bad-resolve.rs
View File

@ -1,5 +1,5 @@
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
trait Trait {
const C: u32 = 0;
@ -34,14 +34,6 @@ impl Trait for S {
reuse foo { &self.0 }
//~^ ERROR cannot find function `foo` in this scope
reuse F::foo { &self.0 }
//~^ ERROR cannot find function `foo` in `F`
//~| ERROR duplicate definitions with name `foo`
}
impl S {
reuse F::foo { &self.0 }
//~^ ERROR cannot find function `foo` in `F`
}
fn main() {}

37
tests/ui/delegation/bad-resolve.stderr
View File

@ -25,18 +25,6 @@ LL | reuse <F as Trait>::baz;
| | help: there is an associated function with a similar name: `bar`
| not a member of trait `Trait`
error[E0201]: duplicate definitions with name `foo`:
--> $DIR/bad-resolve.rs:37:5
|
LL | fn foo(&self, x: i32) -> i32 { x }
| ---------------------------------- item in trait
...
LL | reuse foo { &self.0 }
| --------------------- previous definition here
LL |
LL | reuse F::foo { &self.0 }
| ^^^^^^^^^^^^^^^^^^^^^^^^ duplicate definition
error[E0423]: expected function, found associated constant `Trait::C`
--> $DIR/bad-resolve.rs:24:11
|
@ -66,27 +54,6 @@ error[E0425]: cannot find function `foo` in this scope
LL | reuse foo { &self.0 }
| ^^^ not found in this scope
error[E0425]: cannot find function `foo` in `F`
--> $DIR/bad-resolve.rs:37:14
|
LL | reuse F::foo { &self.0 }
| ^^^ not found in `F`
error[E0425]: cannot find function `foo` in `F`
--> $DIR/bad-resolve.rs:43:14
|
LL | reuse F::foo { &self.0 }
| ^^^ not found in `F`
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/bad-resolve.rs:1:12
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
error[E0046]: not all trait items implemented, missing: `Type`
--> $DIR/bad-resolve.rs:22:1
|
@ -96,7 +63,7 @@ LL | type Type;
LL | impl Trait for S {
| ^^^^^^^^^^^^^^^^ missing `Type` in implementation
error: aborting due to 11 previous errors; 1 warning emitted
error: aborting due to 8 previous errors
Some errors have detailed explanations: E0046, E0201, E0324, E0407, E0423, E0425, E0575, E0576.
Some errors have detailed explanations: E0046, E0324, E0407, E0423, E0425, E0575, E0576.
For more information about an error, try `rustc --explain E0046`.

2
tests/ui/delegation/duplicate-definition-inside-trait-impl.rs
View File

@ -1,5 +1,5 @@
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
trait Trait {
fn foo(&self) -> u32 { 0 }

11
tests/ui/delegation/duplicate-definition-inside-trait-impl.stderr
View File

@ -9,15 +9,6 @@ LL | reuse to_reuse::foo { self }
LL | reuse Trait::foo;
| ^^^^^^^^^^^^^^^^^ duplicate definition
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/duplicate-definition-inside-trait-impl.rs:1:12
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
error: aborting due to 1 previous error; 1 warning emitted
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0201`.

2
tests/ui/delegation/explicit-paths-in-traits-pass.rs
View File

@ -1,7 +1,7 @@
//@ run-pass
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
trait ToReuse {
fn foo(&self, x: i32) -> i32 { x }

11
tests/ui/delegation/explicit-paths-in-traits-pass.stderr
View File

@ -1,11 +0,0 @@
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/explicit-paths-in-traits-pass.rs:3:12
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
warning: 1 warning emitted

13
tests/ui/delegation/explicit-paths-pass.rs
View File

@ -1,7 +1,7 @@
//@ run-pass
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
trait Trait {
fn bar(&self, x: i32) -> i32 { x }
@ -10,7 +10,6 @@ trait Trait {
}
fn static_method(x: i32) -> i32 { x }
fn static_method2(x: i32, y: i32) -> i32 { x + y }
fn baz<'a>(&self, x: &'a i32) -> &'a i32 { x }
}
struct F;
@ -29,11 +28,9 @@ impl Trait for S {
reuse Trait::description { &self.0 }
reuse <F as Trait>::static_method;
reuse <F as Trait>::static_method2 { S::static_method(self) }
reuse Trait::baz { &self.0 }
}
impl S {
reuse Trait::baz { &self.0 }
reuse <F as Trait>::static_method { to_reuse::foo(self) }
}
@ -49,16 +46,8 @@ fn main() {
assert_eq!(42, <S as Trait>::static_method(42));
assert_eq!(21, S::static_method2(10, 10));
reuse <S as Trait>::static_method;
reuse <S as Trait>::static_method2 { static_method(self) }
#[inline]
reuse to_reuse::foo;
assert_eq!(42, static_method(42));
assert_eq!(21, static_method2(10, 10));
assert_eq!(43, foo(42));
assert_eq!(15, zero_args());
let x: i32 = 15;
assert_eq!(&x, <S as Trait>::baz(&s, &x));
assert_eq!(&x, S::baz(&s, &x));
}

11
tests/ui/delegation/explicit-paths-pass.stderr
View File

@ -1,11 +0,0 @@
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/explicit-paths-pass.rs:3:12
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
warning: 1 warning emitted

2
tests/ui/delegation/explicit-paths-signature-pass.rs
View File

@ -1,7 +1,7 @@
//@ run-pass
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
mod to_reuse {
use crate::S;

11
tests/ui/delegation/explicit-paths-signature-pass.stderr
View File

@ -1,11 +0,0 @@
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/explicit-paths-signature-pass.rs:3:12
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
warning: 1 warning emitted

79
tests/ui/delegation/explicit-paths.rs
View File

@ -1,25 +1,84 @@
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
trait Trait {
fn bar(&self) -> i32 { 42 }
fn foo1(&self, x: i32) -> i32 { x }
fn foo2(x: i32) -> i32 { x }
}
struct F;
impl Trait for F {}
struct S(F);
impl Trait for S {
reuse <F as Trait>::bar;
//~^ ERROR mismatched types
pub mod to_reuse {
pub fn foo3() {}
}
struct S2(F);
impl F {
fn foo4(&self) {}
}
impl Trait for S2 {
reuse <S2 as Trait>::bar { &self.0 }
//~^ ERROR mismatched types
mod fn_to_other {
use super::*;
reuse Trait::foo1;
//~^ ERROR delegation to a trait method from a free function is not supported yet
reuse <S as Trait>::foo2;
//~^ ERROR delegation to a trait method from a free function is not supported yet
reuse to_reuse::foo3;
reuse S::foo4;
//~^ ERROR cannot find function `foo4` in `S`
}
mod inherent_impl_assoc_fn_to_other {
use crate::*;
impl S {
reuse Trait::foo1 { &self.0 }
reuse <S as Trait>::foo2;
reuse to_reuse::foo3;
reuse F::foo4 { &self.0 }
//~^ ERROR cannot find function `foo4` in `F`
}
}
mod trait_impl_assoc_fn_to_other {
use crate::*;
impl Trait for S {
reuse Trait::foo1 { &self.0 }
reuse <F as Trait>::foo2;
reuse to_reuse::foo3;
//~^ ERROR method `foo3` is not a member of trait `Trait`
reuse F::foo4 { &self.0 }
//~^ ERROR method `foo4` is not a member of trait `Trait`
//~| ERROR cannot find function `foo4` in `F`
}
}
mod trait_assoc_fn_to_other {
use crate::*;
trait Trait2 : Trait {
reuse <F as Trait>::foo1 { self }
//~^ ERROR mismatched types
reuse <F as Trait>::foo2;
reuse to_reuse::foo3;
reuse F::foo4 { &F }
//~^ ERROR cannot find function `foo4` in `F`
}
}
mod type_mismatch {
use crate::*;
struct S2;
impl Trait for S {
//~^ ERROR conflicting implementations of trait `Trait` for type `S`
reuse <S2 as Trait>::foo1;
//~^ ERROR mismatched types
//~| ERROR the trait bound `S2: Trait` is not satisfied
}
}
fn main() {}

141
tests/ui/delegation/explicit-paths.stderr
View File

@ -1,38 +1,129 @@
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/explicit-paths.rs:1:12
error[E0407]: method `foo3` is not a member of trait `Trait`
--> $DIR/explicit-paths.rs:51:9
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
LL | reuse to_reuse::foo3;
| ^^^^^^^^^^^^^^^^----^
| | |
| | help: there is an associated function with a similar name: `foo1`
| not a member of trait `Trait`
error[E0407]: method `foo4` is not a member of trait `Trait`
--> $DIR/explicit-paths.rs:53:9
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
LL | reuse F::foo4 { &self.0 }
| ^^^^^^^^^----^^^^^^^^^^^^
| | |
| | help: there is an associated function with a similar name: `foo1`
| not a member of trait `Trait`
error[E0425]: cannot find function `foo4` in `S`
--> $DIR/explicit-paths.rs:29:14
|
LL | reuse S::foo4;
| ^^^^ not found in `S`
error[E0425]: cannot find function `foo4` in `F`
--> $DIR/explicit-paths.rs:40:18
|
LL | reuse F::foo4 { &self.0 }
| ^^^^ not found in `F`
|
note: function `fn_to_other::foo4` exists but is inaccessible
--> $DIR/explicit-paths.rs:29:5
|
LL | reuse S::foo4;
| ^^^^^^^^^^^^^^ not accessible
error[E0425]: cannot find function `foo4` in `F`
--> $DIR/explicit-paths.rs:53:18
|
LL | reuse F::foo4 { &self.0 }
| ^^^^ not found in `F`
|
note: function `fn_to_other::foo4` exists but is inaccessible
--> $DIR/explicit-paths.rs:29:5
|
LL | reuse S::foo4;
| ^^^^^^^^^^^^^^ not accessible
error[E0425]: cannot find function `foo4` in `F`
--> $DIR/explicit-paths.rs:67:18
|
LL | reuse F::foo4 { &F }
| ^^^^ not found in `F`
|
note: function `fn_to_other::foo4` exists but is inaccessible
--> $DIR/explicit-paths.rs:29:5
|
LL | reuse S::foo4;
| ^^^^^^^^^^^^^^ not accessible
error[E0119]: conflicting implementations of trait `Trait` for type `S`
--> $DIR/explicit-paths.rs:76:5
|
LL | impl Trait for S {
| ---------------- first implementation here
...
LL | impl Trait for S {
| ^^^^^^^^^^^^^^^^ conflicting implementation for `S`
error: delegation to a trait method from a free function is not supported yet
--> $DIR/explicit-paths.rs:24:18
|
LL | fn foo1(&self, x: i32) -> i32 { x }
| ----------------------------- callee defined here
...
LL | reuse Trait::foo1;
| ^^^^
error: delegation to a trait method from a free function is not supported yet
--> $DIR/explicit-paths.rs:26:25
|
LL | fn foo2(x: i32) -> i32 { x }
| ---------------------- callee defined here
...
LL | reuse <S as Trait>::foo2;
| ^^^^
error[E0308]: mismatched types
--> $DIR/explicit-paths.rs:14:25
--> $DIR/explicit-paths.rs:63:36
|
LL | reuse <F as Trait>::bar;
| --------------^^^
| | |
| | expected `&F`, found `&S`
| arguments to this function are incorrect
LL | trait Trait2 : Trait {
| -------------------- found this type parameter
LL | reuse <F as Trait>::foo1 { self }
| ^^^^ expected `&F`, found `&Self`
|
= note: expected reference `&F`
found reference `&Self`
error[E0277]: the trait bound `S2: Trait` is not satisfied
--> $DIR/explicit-paths.rs:78:16
|
LL | reuse <S2 as Trait>::foo1;
| ^^ the trait `Trait` is not implemented for `S2`
|
= help: the following other types implement trait `Trait`:
F
S
error[E0308]: mismatched types
--> $DIR/explicit-paths.rs:78:30
|
LL | reuse <S2 as Trait>::foo1;
| ---------------^^^^
| | |
| | expected `&S2`, found `&S`
| arguments to this function are incorrect
|
= note: expected reference `&S2`
found reference `&S`
note: method defined here
--> $DIR/explicit-paths.rs:5:8
|
LL | fn bar(&self) -> i32 { 42 }
| ^^^ -----
LL | fn foo1(&self, x: i32) -> i32 { x }
| ^^^^ -----
error[E0308]: mismatched types
--> $DIR/explicit-paths.rs:21:32
|
LL | reuse <S2 as Trait>::bar { &self.0 }
| ^^^^^^^ expected `&S2`, found `&F`
|
= note: expected reference `&S2`
found reference `&F`
error: aborting due to 12 previous errors
error: aborting due to 2 previous errors; 1 warning emitted
For more information about this error, try `rustc --explain E0308`.
Some errors have detailed explanations: E0119, E0277, E0308, E0407, E0425.
For more information about an error, try `rustc --explain E0119`.

2
tests/ui/delegation/not-supported.rs
View File

@ -1,6 +1,6 @@
#![feature(c_variadic)]
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
mod generics {
trait GenericTrait<T> {

11
tests/ui/delegation/not-supported.stderr
View File

@ -1,12 +1,3 @@
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/not-supported.rs:2:12
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
error: delegation with early bound generics is not supported yet
--> $DIR/not-supported.rs:16:29
|
@ -178,7 +169,7 @@ LL | pub reuse to_reuse2::foo;
LL | reuse to_reuse1::foo;
| ^^^
error: aborting due to 19 previous errors; 1 warning emitted
error: aborting due to 19 previous errors
Some errors have detailed explanations: E0049, E0195.
For more information about an error, try `rustc --explain E0049`.

2
tests/ui/delegation/parse.rs
View File

@ -2,7 +2,7 @@
#![feature(decl_macro)]
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
macro_rules! reuse { {} => {} }

11
tests/ui/delegation/parse.stderr
View File

@ -1,11 +0,0 @@
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/parse.rs:4:12
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
warning: 1 warning emitted

2
tests/ui/delegation/target-expr-pass.rs
View File

@ -1,7 +1,7 @@
//@ run-pass
#![feature(fn_delegation)]
//~^ WARN the feature `fn_delegation` is incomplete
#![allow(incomplete_features)]
mod to_reuse {
pub fn foo(x: i32) -> i32 { x }

11
tests/ui/delegation/target-expr-pass.stderr
View File

@ -1,12 +1,3 @@
warning: the feature `fn_delegation` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/target-expr-pass.rs:3:12
|
LL | #![feature(fn_delegation)]
| ^^^^^^^^^^^^^
|
= note: see issue #118212 <https://github.com/rust-lang/rust/issues/118212> for more information
= note: `#[warn(incomplete_features)]` on by default
warning: trait `Trait` is never used
--> $DIR/target-expr-pass.rs:17:7
|
@ -27,5 +18,5 @@ warning: struct `S` is never constructed
LL | struct S(F);
| ^
warning: 4 warnings emitted
warning: 3 warnings emitted

6
tests/ui/delegation/target-expr.rs
View File

@ -14,8 +14,9 @@ fn foo(x: i32) -> i32 { x }
fn bar<T: Default>(_: T) {
reuse Trait::static_method {
//~^ ERROR delegation with early bound generics is not supported yet
//~| ERROR mismatched types
//~^ ERROR delegation to a trait method from a free function is not supported yet
//~| ERROR delegation with early bound generics is not supported yet
//~| ERROR mismatched types
let _ = T::Default();
//~^ ERROR can't use generic parameters from outer item
}
@ -24,6 +25,7 @@ fn bar<T: Default>(_: T) {
fn main() {
let y = 0;
reuse <S as Trait>::static_method {
//~^ ERROR delegation to a trait method from a free function is not supported yet
let x = y;
//~^ ERROR can't capture dynamic environment in a fn item
foo(self);

31
tests/ui/delegation/target-expr.stderr
View File

@ -1,5 +1,5 @@
error[E0401]: can't use generic parameters from outer item
--> $DIR/target-expr.rs:19:17
--> $DIR/target-expr.rs:20:17
|
LL | fn bar<T: Default>(_: T) {
| - type parameter from outer item
@ -10,7 +10,7 @@ LL | let _ = T::Default();
| ^^^^^^^^^^ use of generic parameter from outer item
error[E0434]: can't capture dynamic environment in a fn item
--> $DIR/target-expr.rs:27:17
--> $DIR/target-expr.rs:29:17
|
LL | let x = y;
| ^
@ -18,7 +18,7 @@ LL | let x = y;
= help: use the `|| { ... }` closure form instead
error[E0424]: expected value, found module `self`
--> $DIR/target-expr.rs:34:5
--> $DIR/target-expr.rs:36:5
|
LL | fn main() {
| ---- this function can't have a `self` parameter
@ -27,13 +27,13 @@ LL | self.0;
| ^^^^ `self` value is a keyword only available in methods with a `self` parameter
error[E0425]: cannot find value `x` in this scope
--> $DIR/target-expr.rs:36:13
--> $DIR/target-expr.rs:38:13
|
LL | let z = x;
| ^
|
help: the binding `x` is available in a different scope in the same function
--> $DIR/target-expr.rs:27:13
--> $DIR/target-expr.rs:29:13
|
LL | let x = y;
| ^
@ -47,6 +47,24 @@ LL | fn static_method(x: i32) -> i32 { x }
LL | reuse Trait::static_method {
| ^^^^^^^^^^^^^
error: delegation to a trait method from a free function is not supported yet
--> $DIR/target-expr.rs:16:18
|
LL | fn static_method(x: i32) -> i32 { x }
| ------------------------------- callee defined here
...
LL | reuse Trait::static_method {
| ^^^^^^^^^^^^^
error: delegation to a trait method from a free function is not supported yet
--> $DIR/target-expr.rs:27:25
|
LL | fn static_method(x: i32) -> i32 { x }
| ------------------------------- callee defined here
...
LL | reuse <S as Trait>::static_method {
| ^^^^^^^^^^^^^
error[E0308]: mismatched types
--> $DIR/target-expr.rs:16:32
|
@ -54,12 +72,13 @@ LL | reuse Trait::static_method {
| ________________________________^
LL | |
LL | |
LL | |
LL | | let _ = T::Default();
LL | |
LL | | }
| |_____^ expected `i32`, found `()`
error: aborting due to 6 previous errors
error: aborting due to 8 previous errors
Some errors have detailed explanations: E0308, E0401, E0424, E0425, E0434.
For more information about an error, try `rustc --explain E0308`.