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.

Sign up for GitHub

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

Jump to bottom

internal: support #[rustc_coinductive] #15125

Merged
merged 1 commit into from
Jun 28, 2023
Merged

internal: support #[rustc_coinductive] #15125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions crates/hir-ty/src/chalk_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,14 +550,18 @@ pub(crate) fn trait_datum_query(
debug!("trait_datum {:?}", trait_id);
let trait_ = from_chalk_trait_id(trait_id);
let trait_data = db.trait_data(trait_);

let coinductive =
trait_data.is_auto || db.attrs(trait_.into()).by_key("rustc_coinductive").exists();

debug!("trait {:?} = {:?}", trait_id, trait_data.name);
let generic_params = generics(db.upcast(), trait_.into());
let bound_vars = generic_params.bound_vars_subst(db, DebruijnIndex::INNERMOST);
let flags = rust_ir::TraitFlags {
auto: trait_data.is_auto,
upstream: trait_.lookup(db.upcast()).container.krate() != krate,
non_enumerable: true,
coinductive: false, // only relevant for Chalk testing
coinductive,
// FIXME: set these flags correctly
marker: false,
fundamental: false,
Expand Down Expand Up @@ -637,7 +641,7 @@ pub(crate) fn struct_datum_query(
fundamental: false,
phantom_data: false,
};
// FIXME provide enum variants properly (for auto traits)
// FIXME provide enum variants properly (for auto traits and `Sized`)
let variant = rust_ir::AdtVariantDatum {
fields: Vec::new(), // FIXME add fields (only relevant for auto traits),
};
Expand Down
32 changes: 32 additions & 0 deletions crates/hir-ty/src/tests/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4410,3 +4410,35 @@ fn test(v: S<i32>) {
"#,
);
}

#[test]
fn rustc_coinductive() {
// Taken from rust-lang/rust#108033 with modification.
check_types(
r#"
#[rustc_coinductive]
trait Trait { type Assoc; }

impl<T, U> Trait for (T, U)
where
(U, T): Trait,
(): ConstrainToU32<T>,
{
type Assoc = i32;
}

trait ConstrainToU32<T> {}
impl ConstrainToU32<u32> for () {}

fn impls_trait<T, U, R>() -> R
where
(T, U): Trait<Assoc = R>,
{ loop {} }

fn main() {
let _ = impls_trait::<_, _, _>();
//^ i32
}
"#,
);
}
12 changes: 6 additions & 6 deletions crates/ide/src/inlay_hints/chaining.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9288..9296,
range: 9313..9321,
},
),
tooltip: "",
Expand All @@ -487,7 +487,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9320..9324,
range: 9345..9349,
},
),
tooltip: "",
Expand All @@ -511,7 +511,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9288..9296,
range: 9313..9321,
},
),
tooltip: "",
Expand All @@ -524,7 +524,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9320..9324,
range: 9345..9349,
},
),
tooltip: "",
Expand All @@ -548,7 +548,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9288..9296,
range: 9313..9321,
},
),
tooltip: "",
Expand All @@ -561,7 +561,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9320..9324,
range: 9345..9349,
},
),
tooltip: "",
Expand Down
1 change: 1 addition & 0 deletions crates/test-utils/src/minicore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ pub mod marker {
#[lang = "sized"]
#[fundamental]
#[rustc_specialization_trait]
#[rustc_coinductive]
pub trait Sized {}
// endregion:sized

Expand Down