Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Encode def span for foreign return-position impl Trait in trait #111039

Merged
merged 1 commit into from
May 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compiler/rustc_metadata/src/rmeta/encoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -837,11 +837,12 @@ fn should_encode_span(def_kind: DefKind) -> bool {
| DefKind::AnonConst
| DefKind::InlineConst
| DefKind::OpaqueTy
| DefKind::ImplTraitPlaceholder
| DefKind::Field
| DefKind::Impl { .. }
| DefKind::Closure
| DefKind::Generator => true,
DefKind::ForeignMod | DefKind::ImplTraitPlaceholder | DefKind::GlobalAsm => false,
DefKind::ForeignMod | DefKind::GlobalAsm => false,
}
}

Expand Down
4 changes: 2 additions & 2 deletions tests/ui/impl-trait/in-trait/auxiliary/rpitit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
use std::ops::Deref;

pub trait Foo {
fn bar() -> impl Deref<Target = impl Sized>;
fn bar(self) -> impl Deref<Target = impl Sized>;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a self-param for this aux crate shared between the two tests I touched below, so I can use it for a dyn error 😸

}

pub struct Foreign;
impl Foo for Foreign {
fn bar() -> &'static () { &() }
fn bar(self) -> &'static () { &() }
}
8 changes: 8 additions & 0 deletions tests/ui/impl-trait/in-trait/foreign-dyn-error.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// aux-build: rpitit.rs

extern crate rpitit;

fn main() {
let _: &dyn rpitit::Foo = todo!();
//~^ ERROR the trait `Foo` cannot be made into an object
}
15 changes: 15 additions & 0 deletions tests/ui/impl-trait/in-trait/foreign-dyn-error.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
error[E0038]: the trait `Foo` cannot be made into an object
--> $DIR/foreign-dyn-error.rs:6:12
|
LL | let _: &dyn rpitit::Foo = todo!();
| ^^^^^^^^^^^^^^^^ `Foo` cannot be made into an object
|
note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
--> $DIR/auxiliary/rpitit.rs:8:21
|
LL | fn bar(self) -> impl Deref<Target = impl Sized>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait cannot be made into an object because method `bar` references an `impl Trait` type in its return type

error: aborting due to previous error

For more information about this error, try `rustc --explain E0038`.
9 changes: 5 additions & 4 deletions tests/ui/impl-trait/in-trait/foreign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@

extern crate rpitit;

use rpitit::{Foo, Foreign};
use std::sync::Arc;

// Implement an RPITIT from another crate.
struct Local;
impl rpitit::Foo for Local {
fn bar() -> Arc<String> { Arc::new(String::new()) }
impl Foo for Local {
fn bar(self) -> Arc<String> { Arc::new(String::new()) }
}

fn main() {
// Witness an RPITIT from another crate.
let &() = <rpitit::Foreign as rpitit::Foo>::bar();
let &() = Foreign.bar();

let x: Arc<String> = <Local as rpitit::Foo>::bar();
let x: Arc<String> = Local.bar();
}