Unnamed repository; edit this file 'description' to name the repository.
Add proc-macro-test crate back to the main workspace
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | crates/hir/src/attrs.rs | 9 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/Cargo.toml | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/Cargo.toml b/Cargo.toml index 7054020086..4ee8064b5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = ["xtask/", "lib/*", "crates/*"] -exclude = ["crates/proc-macro-srv/proc-macro-test/"] +exclude = ["crates/proc-macro-srv/proc-macro-test/imp"] resolver = "2" [workspace.package] @@ -138,4 +138,4 @@ dashmap = { version = "=5.5.3", features = ["raw-api"] } collapsible_if = "allow" needless_pass_by_value = "allow" nonminimal_bool = "allow" -redundant_pattern_matching = "allow"
\ No newline at end of file +redundant_pattern_matching = "allow" diff --git a/crates/hir/src/attrs.rs b/crates/hir/src/attrs.rs index bc4d9b9be3..60ddc4aa86 100644 --- a/crates/hir/src/attrs.rs +++ b/crates/hir/src/attrs.rs @@ -101,9 +101,6 @@ pub fn resolve_doc_path_on( link: &str, ns: Option<Namespace>, ) -> Option<DocLinkDef> { - // AttrDefId::FieldId(it) => it.parent.resolver(db.upcast()), - // AttrDefId::EnumVariantId(it) => it.parent.resolver(db.upcast()), - resolve_doc_path_on_(db, link, def.attr_id(), ns) } @@ -267,14 +264,10 @@ fn resolve_impl_trait_item( method_resolution::VisibleFromModule::None, Some(name), &mut |assoc_item_id| { - let assoc_item: AssocItem = assoc_item_id.into(); - - debug_assert_eq!(assoc_item.name(db).as_ref(), Some(name)); - // If two traits in scope define the same item, Rustdoc links to no specific trait (for // instance, given two methods `a`, Rustdoc simply links to `method.a` with no // disambiguation) so we just pick the first one we find as well. - result = as_module_def_if_namespace_matches(assoc_item, ns); + result = as_module_def_if_namespace_matches(assoc_item_id.into(), ns); if result.is_some() { ControlFlow::Break(()) diff --git a/crates/proc-macro-srv/proc-macro-test/Cargo.toml b/crates/proc-macro-srv/proc-macro-test/Cargo.toml index 55be6bc23b..90545bb513 100644 --- a/crates/proc-macro-srv/proc-macro-test/Cargo.toml +++ b/crates/proc-macro-srv/proc-macro-test/Cargo.toml @@ -13,7 +13,7 @@ doctest = false cargo_metadata = "0.18.1" # local deps -toolchain = { path = "../../toolchain", version = "0.0.0" } +toolchain.workspace = true [features] sysroot-abi = [] |