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

Auto merge of #15199 - lowr:patch/revert-15125, r=lowr

Browse Source 
Revert "Support `#[rustc_coinductive]`"

Reverts #15125, addresses https://github.com/rust-lang/rust-analyzer/pull/15125#issuecomment-1615517893

I'll add the support again once I figure out the problem.
This commit is contained in:
bors 2023-07-02 20:27:18 +00:00
commit ff485b63bf
4 changed files with 8 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/hir-ty/src/chalk_db.rs
View File

@ -550,10 +550,6 @@ 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);
@ -561,7 +557,7 @@ pub(crate) fn trait_datum_query(
auto: trait_data.is_auto,
upstream: trait_.lookup(db.upcast()).container.krate() != krate,
non_enumerable: true,
coinductive,
coinductive: false, // only relevant for Chalk testing
// FIXME: set these flags correctly
marker: false,
fundamental: false,
@ -643,7 +639,7 @@ pub(crate) fn struct_datum_query(
fundamental: false,
phantom_data: false,
};
// FIXME provide enum variants properly (for auto traits and `Sized`)
// FIXME provide enum variants properly (for auto traits)
let variant = rust_ir::AdtVariantDatum {
fields: Vec::new(), // FIXME add fields (only relevant for auto traits),
};

32
crates/hir-ty/src/tests/traits.rs
View File

@ -4410,35 +4410,3 @@ 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
crates/ide/src/inlay_hints/chaining.rs
View File

@ -474,7 +474,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9313..9321,
range: 9288..9296,
},
),
tooltip: "",
@ -487,7 +487,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9345..9349,
range: 9320..9324,
},
),
tooltip: "",
@ -511,7 +511,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9313..9321,
range: 9288..9296,
},
),
tooltip: "",
@ -524,7 +524,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9345..9349,
range: 9320..9324,
},
),
tooltip: "",
@ -548,7 +548,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9313..9321,
range: 9288..9296,
},
),
tooltip: "",
@ -561,7 +561,7 @@ fn main() {
file_id: FileId(
1,
),
range: 9345..9349,
range: 9320..9324,
},
),
tooltip: "",

1
crates/test-utils/src/minicore.rs
View File

@ -63,7 +63,6 @@ pub mod marker {
#[lang = "sized"]
#[fundamental]
#[rustc_specialization_trait]
#[rustc_coinductive]
pub trait Sized {}
// endregion:sized