language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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
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();