Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18490 from ShoyuVanilla/dyn-compat-rename

Browse source 
minor: Rename `dyn compatible` to `dyn-compatible`
This commit is contained in:
Laurențiu Nicola 2024-11-07 14:21:40 +00:00 committed by GitHub
commit 1042a8c22c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/hir-ty/src/chalk_db.rs
View file

@ -381,8 +381,9 @@ impl chalk_solve::RustIrDatabase<Interner> for ChalkContext<'_> {
TyKind::Error.intern(Interner)
}
// object safety was renamed to dyn-compatibility but still remains here in chalk.
// This will be removed since we are going to migrate to next-gen trait solver.
fn is_object_safe(&self, trait_id: chalk_ir::TraitId<Interner>) -> bool {
// FIXME: When cargo is updated, change to dyn_compatibility
let trait_ = from_chalk_trait_id(trait_id);
crate::dyn_compatibility::dyn_compatibility(self.db, trait_).is_none()
}

2
crates/hir-ty/src/dyn_compatibility.rs
View file

@ -472,7 +472,7 @@ fn receiver_is_dispatchable(
return false;
};
// `self: Self` can't be dispatched on, but this is already considered dyn compatible
// `self: Self` can't be dispatched on, but this is already considered dyn-compatible
// See rustc's comment on https://github.com/rust-lang/rust/blob/3f121b9461cce02a703a0e7e450568849dfaa074/compiler/rustc_trait_selection/src/traits/object_safety.rs#L433-L437
if sig
.skip_binders()

2
crates/hir-ty/src/dyn_compatibility/tests.rs
View file

@ -66,7 +66,7 @@ fn check_dyn_compatibility<'a>(
});
ControlFlow::Continue(())
});
assert_eq!(osvs, expected, "Dyn Compatibility violations for `{name}` do not match;");
assert_eq!(osvs, expected, "dyn-compatibility violations for `{name}` do not match;");
}
let remains: Vec<_> = expected.keys().collect();

6
crates/ide/src/hover/render.rs
View file

@ -1009,10 +1009,10 @@ fn render_dyn_compatibility(
safety: Option<DynCompatibilityViolation>,
) {
let Some(osv) = safety else {
buf.push_str("Is Dyn compatible");
buf.push_str("Is dyn-compatible");
return;
};
buf.push_str("Is not Dyn compatible due to ");
buf.push_str("Is not dyn-compatible due to ");
match osv {
DynCompatibilityViolation::SizedSelf => {
buf.push_str("having a `Self: Sized` bound");
@ -1055,7 +1055,7 @@ fn render_dyn_compatibility(
}
DynCompatibilityViolation::HasNonCompatibleSuperTrait(super_trait) => {
let name = hir::Trait::from(super_trait).name(db);
format_to!(buf, "having a dyn incompatible supertrait `{}`", name.as_str());
format_to!(buf, "having a dyn-incompatible supertrait `{}`", name.as_str());
}
}
}

4
crates/ide/src/hover/tests.rs
View file

@ -9371,7 +9371,7 @@ trait Compat$0 {}
---
Is Dyn compatible
Is dyn-compatible
"#]],
);
check(
@ -9393,7 +9393,7 @@ trait UnCompat$0 {
---
Is not Dyn compatible due to having a method `f` that is not dispatchable due to missing a receiver
Is not dyn-compatible due to having a method `f` that is not dispatchable due to missing a receiver
"#]],
);
check(