Auto merge of #18205 - noahmbright:object_safety, r=HKalbasi
Rename object_safety
First PR here (yay!), so I read some of the getting started docs. There are a couple references to `handlers.rs`, which as far as I can tell has been refactored into `handlers/*.rs`. I made some tweaks to that in one commit. There is one fixme about a function called `to_lsp_runnable`, which I can't find anywhere at all. I can update that if I get some more info there.
Otherwise I changed references to object safety, is object safe, etc., trying to match case/style as I went. There was one case I found where there's a trait from somewhere else called `is_object_safe`, which I found defined in my cargo registry. I didn't touch that for now, just marked it with a fixme
diff --git a/crates/hir-ty/src/chalk_db.rs b/crates/hir-ty/src/chalk_db.rs
index e74e3d7..f7bacbd 100644
--- a/crates/hir-ty/src/chalk_db.rs
+++ b/crates/hir-ty/src/chalk_db.rs
@@ -382,8 +382,9 @@
}
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::object_safety::object_safety(self.db, trait_).is_none()
+ crate::dyn_compatibility::dyn_compatibility(self.db, trait_).is_none()
}
fn closure_kind(
diff --git a/crates/hir-ty/src/db.rs b/crates/hir-ty/src/db.rs
index ce5a821..5620d80 100644
--- a/crates/hir-ty/src/db.rs
+++ b/crates/hir-ty/src/db.rs
@@ -20,11 +20,11 @@
use crate::{
chalk_db,
consteval::ConstEvalError,
+ dyn_compatibility::DynCompatibilityViolation,
layout::{Layout, LayoutError},
lower::{GenericDefaults, GenericPredicates},
method_resolution::{InherentImpls, TraitImpls, TyFingerprint},
mir::{BorrowckResult, MirBody, MirLowerError},
- object_safety::ObjectSafetyViolation,
Binders, ClosureId, Const, FnDefId, ImplTraitId, ImplTraits, InferenceResult, Interner,
PolyFnSig, Substitution, TraitEnvironment, TraitRef, Ty, TyDefId, ValueTyDefId,
};
@@ -108,8 +108,8 @@
#[salsa::invoke(crate::layout::target_data_layout_query)]
fn target_data_layout(&self, krate: CrateId) -> Result<Arc<TargetDataLayout>, Arc<str>>;
- #[salsa::invoke(crate::object_safety::object_safety_of_trait_query)]
- fn object_safety_of_trait(&self, trait_: TraitId) -> Option<ObjectSafetyViolation>;
+ #[salsa::invoke(crate::dyn_compatibility::dyn_compatibility_of_trait_query)]
+ fn dyn_compatibility_of_trait(&self, trait_: TraitId) -> Option<DynCompatibilityViolation>;
#[salsa::invoke(crate::lower::ty_query)]
#[salsa::cycle(crate::lower::ty_recover)]
@@ -280,8 +280,8 @@
}
#[test]
-fn hir_database_is_object_safe() {
- fn _assert_object_safe(_: &dyn HirDatabase) {}
+fn hir_database_is_dyn_compatible() {
+ fn _assert_dyn_compatible(_: &dyn HirDatabase) {}
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
diff --git a/crates/hir-ty/src/object_safety.rs b/crates/hir-ty/src/dyn_compatibility.rs
similarity index 92%
rename from crates/hir-ty/src/object_safety.rs
rename to crates/hir-ty/src/dyn_compatibility.rs
index a4c6626..e0d1758 100644
--- a/crates/hir-ty/src/object_safety.rs
+++ b/crates/hir-ty/src/dyn_compatibility.rs
@@ -1,4 +1,4 @@
-//! Compute the object-safety of a trait
+//! Compute the dyn-compatibility of a trait
use std::ops::ControlFlow;
@@ -28,14 +28,14 @@
};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ObjectSafetyViolation {
+pub enum DynCompatibilityViolation {
SizedSelf,
SelfReferential,
Method(FunctionId, MethodViolationCode),
AssocConst(ConstId),
GAT(TypeAliasId),
// This doesn't exist in rustc, but added for better visualization
- HasNonSafeSuperTrait(TraitId),
+ HasNonCompatibleSuperTrait(TraitId),
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -50,70 +50,73 @@
UndispatchableReceiver,
}
-pub fn object_safety(db: &dyn HirDatabase, trait_: TraitId) -> Option<ObjectSafetyViolation> {
+pub fn dyn_compatibility(
+ db: &dyn HirDatabase,
+ trait_: TraitId,
+) -> Option<DynCompatibilityViolation> {
for super_trait in all_super_traits(db.upcast(), trait_).into_iter().skip(1).rev() {
- if db.object_safety_of_trait(super_trait).is_some() {
- return Some(ObjectSafetyViolation::HasNonSafeSuperTrait(super_trait));
+ if db.dyn_compatibility_of_trait(super_trait).is_some() {
+ return Some(DynCompatibilityViolation::HasNonCompatibleSuperTrait(super_trait));
}
}
- db.object_safety_of_trait(trait_)
+ db.dyn_compatibility_of_trait(trait_)
}
-pub fn object_safety_with_callback<F>(
+pub fn dyn_compatibility_with_callback<F>(
db: &dyn HirDatabase,
trait_: TraitId,
cb: &mut F,
) -> ControlFlow<()>
where
- F: FnMut(ObjectSafetyViolation) -> ControlFlow<()>,
+ F: FnMut(DynCompatibilityViolation) -> ControlFlow<()>,
{
for super_trait in all_super_traits(db.upcast(), trait_).into_iter().skip(1).rev() {
- if db.object_safety_of_trait(super_trait).is_some() {
- cb(ObjectSafetyViolation::HasNonSafeSuperTrait(trait_))?;
+ if db.dyn_compatibility_of_trait(super_trait).is_some() {
+ cb(DynCompatibilityViolation::HasNonCompatibleSuperTrait(trait_))?;
}
}
- object_safety_of_trait_with_callback(db, trait_, cb)
+ dyn_compatibility_of_trait_with_callback(db, trait_, cb)
}
-pub fn object_safety_of_trait_with_callback<F>(
+pub fn dyn_compatibility_of_trait_with_callback<F>(
db: &dyn HirDatabase,
trait_: TraitId,
cb: &mut F,
) -> ControlFlow<()>
where
- F: FnMut(ObjectSafetyViolation) -> ControlFlow<()>,
+ F: FnMut(DynCompatibilityViolation) -> ControlFlow<()>,
{
// Check whether this has a `Sized` bound
if generics_require_sized_self(db, trait_.into()) {
- cb(ObjectSafetyViolation::SizedSelf)?;
+ cb(DynCompatibilityViolation::SizedSelf)?;
}
// Check if there exist bounds that referencing self
if predicates_reference_self(db, trait_) {
- cb(ObjectSafetyViolation::SelfReferential)?;
+ cb(DynCompatibilityViolation::SelfReferential)?;
}
if bounds_reference_self(db, trait_) {
- cb(ObjectSafetyViolation::SelfReferential)?;
+ cb(DynCompatibilityViolation::SelfReferential)?;
}
// rustc checks for non-lifetime binders here, but we don't support HRTB yet
let trait_data = db.trait_data(trait_);
for (_, assoc_item) in &trait_data.items {
- object_safety_violation_for_assoc_item(db, trait_, *assoc_item, cb)?;
+ dyn_compatibility_violation_for_assoc_item(db, trait_, *assoc_item, cb)?;
}
ControlFlow::Continue(())
}
-pub fn object_safety_of_trait_query(
+pub fn dyn_compatibility_of_trait_query(
db: &dyn HirDatabase,
trait_: TraitId,
-) -> Option<ObjectSafetyViolation> {
+) -> Option<DynCompatibilityViolation> {
let mut res = None;
- object_safety_of_trait_with_callback(db, trait_, &mut |osv| {
+ dyn_compatibility_of_trait_with_callback(db, trait_, &mut |osv| {
res = Some(osv);
ControlFlow::Break(())
});
@@ -321,14 +324,14 @@
t.visit_with(visitor.as_dyn(), outer_binder).is_break()
}
-fn object_safety_violation_for_assoc_item<F>(
+fn dyn_compatibility_violation_for_assoc_item<F>(
db: &dyn HirDatabase,
trait_: TraitId,
item: AssocItemId,
cb: &mut F,
) -> ControlFlow<()>
where
- F: FnMut(ObjectSafetyViolation) -> ControlFlow<()>,
+ F: FnMut(DynCompatibilityViolation) -> ControlFlow<()>,
{
// Any item that has a `Self : Sized` requisite is otherwise
// exempt from the regulations.
@@ -337,10 +340,10 @@
}
match item {
- AssocItemId::ConstId(it) => cb(ObjectSafetyViolation::AssocConst(it)),
+ AssocItemId::ConstId(it) => cb(DynCompatibilityViolation::AssocConst(it)),
AssocItemId::FunctionId(it) => {
virtual_call_violations_for_method(db, trait_, it, &mut |mvc| {
- cb(ObjectSafetyViolation::Method(it, mvc))
+ cb(DynCompatibilityViolation::Method(it, mvc))
})
}
AssocItemId::TypeAliasId(it) => {
@@ -350,7 +353,7 @@
} else {
let generic_params = db.generic_params(item.into());
if !generic_params.is_empty() {
- cb(ObjectSafetyViolation::GAT(it))
+ cb(DynCompatibilityViolation::GAT(it))
} else {
ControlFlow::Continue(())
}
@@ -469,7 +472,7 @@
return false;
};
- // `self: Self` can't be dispatched on, but this is already considered object safe.
+ // `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()
diff --git a/crates/hir-ty/src/object_safety/tests.rs b/crates/hir-ty/src/dyn_compatibility/tests.rs
similarity index 77%
rename from crates/hir-ty/src/object_safety/tests.rs
rename to crates/hir-ty/src/dyn_compatibility/tests.rs
index c2a9117..3f3e68e 100644
--- a/crates/hir-ty/src/object_safety/tests.rs
+++ b/crates/hir-ty/src/dyn_compatibility/tests.rs
@@ -5,29 +5,29 @@
use syntax::ToSmolStr;
use test_fixture::WithFixture;
-use crate::{object_safety::object_safety_with_callback, test_db::TestDB};
+use crate::{dyn_compatibility::dyn_compatibility_with_callback, test_db::TestDB};
use super::{
+ DynCompatibilityViolation,
MethodViolationCode::{self, *},
- ObjectSafetyViolation,
};
-use ObjectSafetyViolationKind::*;
+use DynCompatibilityViolationKind::*;
#[allow(clippy::upper_case_acronyms)]
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-enum ObjectSafetyViolationKind {
+enum DynCompatibilityViolationKind {
SizedSelf,
SelfReferential,
Method(MethodViolationCode),
AssocConst,
GAT,
- HasNonSafeSuperTrait,
+ HasNonCompatibleSuperTrait,
}
-fn check_object_safety<'a>(
+fn check_dyn_compatibility<'a>(
ra_fixture: &str,
- expected: impl IntoIterator<Item = (&'a str, Vec<ObjectSafetyViolationKind>)>,
+ expected: impl IntoIterator<Item = (&'a str, Vec<DynCompatibilityViolationKind>)>,
) {
let mut expected: FxHashMap<_, _> =
expected.into_iter().map(|(id, osvs)| (id, FxHashSet::from_iter(osvs))).collect();
@@ -53,18 +53,20 @@
continue;
};
let mut osvs = FxHashSet::default();
- object_safety_with_callback(&db, trait_id, &mut |osv| {
+ dyn_compatibility_with_callback(&db, trait_id, &mut |osv| {
osvs.insert(match osv {
- ObjectSafetyViolation::SizedSelf => SizedSelf,
- ObjectSafetyViolation::SelfReferential => SelfReferential,
- ObjectSafetyViolation::Method(_, mvc) => Method(mvc),
- ObjectSafetyViolation::AssocConst(_) => AssocConst,
- ObjectSafetyViolation::GAT(_) => GAT,
- ObjectSafetyViolation::HasNonSafeSuperTrait(_) => HasNonSafeSuperTrait,
+ DynCompatibilityViolation::SizedSelf => SizedSelf,
+ DynCompatibilityViolation::SelfReferential => SelfReferential,
+ DynCompatibilityViolation::Method(_, mvc) => Method(mvc),
+ DynCompatibilityViolation::AssocConst(_) => AssocConst,
+ DynCompatibilityViolation::GAT(_) => GAT,
+ DynCompatibilityViolation::HasNonCompatibleSuperTrait(_) => {
+ HasNonCompatibleSuperTrait
+ }
});
ControlFlow::Continue(())
});
- assert_eq!(osvs, expected, "Object safety violations for `{name}` do not match;");
+ assert_eq!(osvs, expected, "Dyn Compatibility violations for `{name}` do not match;");
}
let remains: Vec<_> = expected.keys().collect();
@@ -73,7 +75,7 @@
#[test]
fn item_bounds_can_reference_self() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: eq
pub trait Foo {
@@ -88,7 +90,7 @@
#[test]
fn associated_consts() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
trait Bar {
const X: usize;
@@ -100,7 +102,7 @@
#[test]
fn bounds_reference_self() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: eq
trait X {
@@ -113,7 +115,7 @@
#[test]
fn by_value_self() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Bar {
@@ -135,7 +137,7 @@
#[test]
fn generic_methods() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Bar {
@@ -157,7 +159,7 @@
#[test]
fn mentions_self() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Bar {
@@ -182,7 +184,7 @@
#[test]
fn no_static() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Foo {
@@ -195,7 +197,7 @@
#[test]
fn sized_self() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Bar: Sized {
@@ -205,7 +207,7 @@
[("Bar", vec![SizedSelf])],
);
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Bar
@@ -220,7 +222,7 @@
#[test]
fn supertrait_gat() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait GatTrait {
@@ -229,13 +231,13 @@
trait SuperTrait<T>: GatTrait {}
"#,
- [("GatTrait", vec![GAT]), ("SuperTrait", vec![HasNonSafeSuperTrait])],
+ [("GatTrait", vec![GAT]), ("SuperTrait", vec![HasNonCompatibleSuperTrait])],
);
}
#[test]
fn supertrait_mentions_self() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Bar<T> {
@@ -251,7 +253,7 @@
#[test]
fn rustc_issue_19538() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Foo {
@@ -260,13 +262,13 @@
trait Bar: Foo {}
"#,
- [("Foo", vec![Method(Generic)]), ("Bar", vec![HasNonSafeSuperTrait])],
+ [("Foo", vec![Method(Generic)]), ("Bar", vec![HasNonCompatibleSuperTrait])],
);
}
#[test]
fn rustc_issue_22040() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: fmt, eq, dispatch_from_dyn
use core::fmt::Debug;
@@ -281,7 +283,7 @@
#[test]
fn rustc_issue_102762() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: future, send, sync, dispatch_from_dyn, deref
use core::pin::Pin;
@@ -313,7 +315,7 @@
#[test]
fn rustc_issue_102933() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: future, dispatch_from_dyn, deref
use core::future::Future;
@@ -351,7 +353,7 @@
#[test]
fn rustc_issue_106247() {
- check_object_safety(
+ check_dyn_compatibility(
r#"
//- minicore: sync, dispatch_from_dyn
pub trait Trait {
@@ -363,8 +365,8 @@
}
#[test]
-fn std_error_is_object_safe() {
- check_object_safety(
+fn std_error_is_dyn_compatible() {
+ check_dyn_compatibility(
r#"
//- minicore: fmt, dispatch_from_dyn
trait Erased<'a>: 'a {}
@@ -380,14 +382,14 @@
}
#[test]
-fn lifetime_gat_is_object_unsafe() {
- check_object_safety(
+fn lifetime_gat_is_dyn_incompatible() {
+ check_dyn_compatibility(
r#"
//- minicore: dispatch_from_dyn
trait Foo {
type Bar<'a>;
}
"#,
- [("Foo", vec![ObjectSafetyViolationKind::GAT])],
+ [("Foo", vec![DynCompatibilityViolationKind::GAT])],
);
}
diff --git a/crates/hir-ty/src/lib.rs b/crates/hir-ty/src/lib.rs
index 5ed41b9..ef570a2 100644
--- a/crates/hir-ty/src/lib.rs
+++ b/crates/hir-ty/src/lib.rs
@@ -38,11 +38,11 @@
pub mod db;
pub mod diagnostics;
pub mod display;
+pub mod dyn_compatibility;
pub mod lang_items;
pub mod layout;
pub mod method_resolution;
pub mod mir;
-pub mod object_safety;
pub mod primitive;
pub mod traits;
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 8f5db32..e2cf5b0 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -144,9 +144,9 @@
hir_ty::{
consteval::ConstEvalError,
display::{ClosureStyle, HirDisplay, HirDisplayError, HirWrite},
+ dyn_compatibility::{DynCompatibilityViolation, MethodViolationCode},
layout::LayoutError,
mir::{MirEvalError, MirLowerError},
- object_safety::{MethodViolationCode, ObjectSafetyViolation},
CastError, FnAbi, PointerCast, Safety,
},
// FIXME: Properly encapsulate mir
@@ -2690,8 +2690,8 @@
.count()
}
- pub fn object_safety(&self, db: &dyn HirDatabase) -> Option<ObjectSafetyViolation> {
- hir_ty::object_safety::object_safety(db, self.id)
+ pub fn dyn_compatibility(&self, db: &dyn HirDatabase) -> Option<DynCompatibilityViolation> {
+ hir_ty::dyn_compatibility::dyn_compatibility(db, self.id)
}
fn all_macro_calls(&self, db: &dyn HirDatabase) -> Box<[(AstId<ast::Item>, MacroCallId)]> {
diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs
index abf4438..2661097 100644
--- a/crates/ide-db/src/generated/lints.rs
+++ b/crates/ide-db/src/generated/lints.rs
@@ -7081,8 +7081,8 @@
"##,
},
Lint {
- label: "object_safe_for_dispatch",
- description: r##"# `object_safe_for_dispatch`
+ label: "dyn_compatible_for_dispatch",
+ description: r##"# `dyn_compatible_for_dispatch`
The tracking issue for this feature is: [#43561]
diff --git a/crates/ide/src/hover/render.rs b/crates/ide/src/hover/render.rs
index 83adf65..5a8c9a9 100644
--- a/crates/ide/src/hover/render.rs
+++ b/crates/ide/src/hover/render.rs
@@ -3,9 +3,9 @@
use either::Either;
use hir::{
- db::ExpandDatabase, Adt, AsAssocItem, AsExternAssocItem, CaptureKind, HasCrate, HasSource,
- HirDisplay, Layout, LayoutError, MethodViolationCode, Name, ObjectSafetyViolation, Semantics,
- Trait, Type, TypeInfo,
+ db::ExpandDatabase, Adt, AsAssocItem, AsExternAssocItem, CaptureKind,
+ DynCompatibilityViolation, HasCrate, HasSource, HirDisplay, Layout, LayoutError,
+ MethodViolationCode, Name, Semantics, Trait, Type, TypeInfo,
};
use ide_db::{
base_db::SourceDatabase,
@@ -529,10 +529,10 @@
_ => None,
};
- let object_safety_info = if let Definition::Trait(it) = def {
- let mut object_safety_info = String::new();
- render_object_safety(db, &mut object_safety_info, it.object_safety(db));
- Some(object_safety_info)
+ let dyn_compatibility_info = if let Definition::Trait(it) = def {
+ let mut dyn_compatibility_info = String::new();
+ render_dyn_compatibility(db, &mut dyn_compatibility_info, it.dyn_compatibility(db));
+ Some(dyn_compatibility_info)
} else {
None
};
@@ -546,8 +546,8 @@
desc.push_str(&layout_info);
desc.push('\n');
}
- if let Some(object_safety_info) = object_safety_info {
- desc.push_str(&object_safety_info);
+ if let Some(dyn_compatibility_info) = dyn_compatibility_info {
+ desc.push_str(&dyn_compatibility_info);
desc.push('\n');
}
desc.push_str(&label);
@@ -980,24 +980,24 @@
}
}
-fn render_object_safety(
+fn render_dyn_compatibility(
db: &RootDatabase,
buf: &mut String,
- safety: Option<ObjectSafetyViolation>,
+ safety: Option<DynCompatibilityViolation>,
) {
let Some(osv) = safety else {
- buf.push_str("// Object Safety: Yes");
+ buf.push_str("// Dyn Compatible: Yes");
return;
};
- buf.push_str("// Object Safety: No\n// - Reason: ");
+ buf.push_str("// Dyn Compatible: No\n// - Reason: ");
match osv {
- ObjectSafetyViolation::SizedSelf => {
+ DynCompatibilityViolation::SizedSelf => {
buf.push_str("has a `Self: Sized` bound");
}
- ObjectSafetyViolation::SelfReferential => {
+ DynCompatibilityViolation::SelfReferential => {
buf.push_str("has a bound that references `Self`");
}
- ObjectSafetyViolation::Method(func, mvc) => {
+ DynCompatibilityViolation::Method(func, mvc) => {
let name = hir::Function::from(func).name(db);
format_to!(
buf,
@@ -1020,7 +1020,7 @@
};
buf.push_str(desc);
}
- ObjectSafetyViolation::AssocConst(const_) => {
+ DynCompatibilityViolation::AssocConst(const_) => {
let name = hir::Const::from(const_).name(db);
if let Some(name) = name {
format_to!(buf, "has an associated constant `{}`", name.as_str());
@@ -1028,11 +1028,11 @@
buf.push_str("has an associated constant");
}
}
- ObjectSafetyViolation::GAT(alias) => {
+ DynCompatibilityViolation::GAT(alias) => {
let name = hir::TypeAlias::from(alias).name(db);
format_to!(buf, "has a generic associated type `{}`", name.as_str());
}
- ObjectSafetyViolation::HasNonSafeSuperTrait(super_trait) => {
+ DynCompatibilityViolation::HasNonCompatibleSuperTrait(super_trait) => {
let name = hir::Trait::from(super_trait).name(db);
format_to!(buf, "has a object unsafe supertrait `{}`", name.as_str());
}
diff --git a/crates/ide/src/hover/tests.rs b/crates/ide/src/hover/tests.rs
index cca62d2..db2b980 100644
--- a/crates/ide/src/hover/tests.rs
+++ b/crates/ide/src/hover/tests.rs
@@ -7175,7 +7175,7 @@
```
```rust
- // Object Safety: Yes
+ // Dyn Compatible: Yes
trait T {}
```
"#]],
@@ -7195,7 +7195,7 @@
```
```rust
- // Object Safety: Yes
+ // Dyn Compatible: Yes
trait T {}
```
"#]],
@@ -7219,7 +7219,7 @@
```
```rust
- // Object Safety: No
+ // Dyn Compatible: No
// - Reason: has a method `func` that is non dispatchable because of:
// - missing a receiver
trait T { /* … */ }
@@ -7245,7 +7245,7 @@
```
```rust
- // Object Safety: No
+ // Dyn Compatible: No
// - Reason: has a method `func` that is non dispatchable because of:
// - missing a receiver
trait T {
@@ -7275,7 +7275,7 @@
```
```rust
- // Object Safety: No
+ // Dyn Compatible: No
// - Reason: has a method `func` that is non dispatchable because of:
// - missing a receiver
trait T {
@@ -7305,7 +7305,7 @@
```
```rust
- // Object Safety: No
+ // Dyn Compatible: No
// - Reason: has a method `func` that is non dispatchable because of:
// - missing a receiver
trait T {
diff --git a/crates/syntax/src/ast.rs b/crates/syntax/src/ast.rs
index 3ce9afa..32b1f5f 100644
--- a/crates/syntax/src/ast.rs
+++ b/crates/syntax/src/ast.rs
@@ -167,7 +167,7 @@
}
#[test]
-fn assert_ast_is_object_safe() {
+fn assert_ast_is_dyn_compatible() {
fn _f(_: &dyn AstNode, _: &dyn HasName) {}
}
diff --git a/crates/vfs/src/loader.rs b/crates/vfs/src/loader.rs
index f24354c..c49e4c4 100644
--- a/crates/vfs/src/loader.rs
+++ b/crates/vfs/src/loader.rs
@@ -1,4 +1,4 @@
-//! Object safe interface for file watching and reading.
+//! Dynamically compatible interface for file watching and reading.
use std::fmt;
use paths::{AbsPath, AbsPathBuf};
@@ -232,6 +232,6 @@
}
#[test]
-fn handle_is_object_safe() {
+fn handle_is_dyn_compatible() {
fn _assert(_: &dyn Handle) {}
}
diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index 4f8723a9..6aa57b2 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md
@@ -42,7 +42,7 @@
`crates/rust-analyzer/src/bin/main.rs` contains the main function which spawns LSP.
This is *the* entry point, but it front-loads a lot of complexity, so it's fine to just skim through it.
-`crates/rust-analyzer/src/handlers.rs` implements all LSP requests and is a great place to start if you are already familiar with LSP.
+`crates/rust-analyzer/src/handlers/requests.rs` implements all LSP requests and is a great place to start if you are already familiar with LSP.
`Analysis` and `AnalysisHost` types define the main API for consumers of IDE services.
diff --git a/docs/dev/syntax.md b/docs/dev/syntax.md
index 6c4daec..3dcd430 100644
--- a/docs/dev/syntax.md
+++ b/docs/dev/syntax.md
@@ -378,7 +378,7 @@
}
```
-Shared AST substructures are modeled via (object safe) traits:
+Shared AST substructures are modeled via (dynamically compatible) traits:
```rust
trait HasVisibility: AstNode {
diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts
index b3f1b05..fb7e340 100644
--- a/editors/code/src/debug.ts
+++ b/editors/code/src/debug.ts
@@ -173,6 +173,8 @@
if (debugConfig.name === "run binary") {
// The LSP side: crates\rust-analyzer\src\main_loop\handlers.rs,
// fn to_lsp_runnable(...) with RunnableKind::Bin
+ // FIXME: Neither crates\rust-analyzer\src\main_loop\handlers.rs
+ // nor to_lsp_runnable exist anymore
debugConfig.name = `run ${path.basename(executable)}`;
}
diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts
index dd0da6b..8a82a5a 100644
--- a/editors/code/src/run.ts
+++ b/editors/code/src/run.ts
@@ -36,7 +36,7 @@
if (runnables.length === 0) {
// it is the debug case, run always has at least 'cargo check ...'
- // see crates\rust-analyzer\src\main_loop\handlers.rs, handle_runnables
+ // see crates\rust-analyzer\src\handlers\request.rs, handle_runnables
await vscode.window.showErrorMessage("There's no debug target!");
quickPick.dispose();
return;
diff --git a/editors/code/src/toolchain.ts b/editors/code/src/toolchain.ts
index 850a6a5..e8bab9c 100644
--- a/editors/code/src/toolchain.ts
+++ b/editors/code/src/toolchain.ts
@@ -29,7 +29,7 @@
static artifactSpec(cargoArgs: string[], executableArgs?: string[]): ArtifactSpec {
cargoArgs = [...cargoArgs, "--message-format=json"];
// arguments for a runnable from the quick pick should be updated.
- // see crates\rust-analyzer\src\main_loop\handlers.rs, handle_code_lens
+ // see crates\rust-analyzer\src\handlers\request.rs, handle_code_lens
switch (cargoArgs[0]) {
case "run":
cargoArgs[0] = "build";
