Skip to content

Commit 078fbc6

Browse files
committed
Rust: Remove resolve_paths from the translator.
1 parent 456f560 commit 078fbc6

File tree

1 file changed

+4
-69
lines changed
  • rust/extractor/src/translate

1 file changed

+4
-69
lines changed

rust/extractor/src/translate/base.rs

Lines changed: 4 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ pub struct Translator<'a> {
188188
line_index: LineIndex,
189189
file_id: Option<EditionedFileId>,
190190
pub semantics: Option<&'a Semantics<'a, RootDatabase>>,
191-
resolve_paths: bool,
192191
source_kind: SourceKind,
193192
pub(crate) macro_context_depth: usize,
194193
diagnostic_count: usize,
@@ -215,7 +214,6 @@ impl<'a> Translator<'a> {
215214
line_index,
216215
file_id: semantic_info.map(|i| i.file_id),
217216
semantics: semantic_info.map(|i| i.semantics),
218-
resolve_paths: false,
219217
source_kind,
220218
macro_context_depth: 0,
221219
diagnostic_count: 0,
@@ -685,94 +683,31 @@ impl<'a> Translator<'a> {
685683
item: &T,
686684
label: Label<generated::Addressable>,
687685
) {
688-
if !self.resolve_paths {
689-
return;
690-
}
691-
(|| {
692-
let sema = self.semantics.as_ref()?;
693-
let def = T::Hir::try_from_source(item, sema)?;
694-
let path = self.canonical_path_from_hir(def)?;
695-
let origin = self.origin_from_hir(def);
696-
generated::Addressable::emit_crate_origin(label, origin, &mut self.trap.writer);
697-
generated::Addressable::emit_extended_canonical_path(
698-
label,
699-
path,
700-
&mut self.trap.writer,
701-
);
702-
Some(())
703-
})();
686+
// TODO: remove method.
704687
}
705688

706689
pub(crate) fn extract_canonical_origin_of_enum_variant(
707690
&mut self,
708691
item: &ast::Variant,
709692
label: Label<generated::Variant>,
710693
) {
711-
if !self.resolve_paths {
712-
return;
713-
}
714-
(|| {
715-
let sema = self.semantics.as_ref()?;
716-
let def = sema.to_enum_variant_def(item)?;
717-
let path = self.canonical_path_from_enum_variant(def)?;
718-
let origin = self.origin_from_enum_variant(def);
719-
generated::Addressable::emit_crate_origin(label.into(), origin, &mut self.trap.writer);
720-
generated::Addressable::emit_extended_canonical_path(
721-
label.into(),
722-
path,
723-
&mut self.trap.writer,
724-
);
725-
Some(())
726-
})();
694+
// TODO: remove method.
727695
}
728696

729697
pub(crate) fn extract_path_canonical_destination(
730698
&mut self,
731699
item: &impl PathAst,
732700
label: Label<generated::Resolvable>,
733701
) {
734-
if !self.resolve_paths {
735-
return;
736-
}
737-
(|| {
738-
let path = item.path()?;
739-
let sema = self.semantics.as_ref()?;
740-
let resolution = sema.resolve_path(&path)?;
741-
let PathResolution::Def(def) = resolution else {
742-
return None;
743-
};
744-
let origin = self.origin_from_module_def(def)?;
745-
let path = self.canonical_path_from_module_def(def)?;
746-
generated::Resolvable::emit_resolved_crate_origin(label, origin, &mut self.trap.writer);
747-
generated::Resolvable::emit_resolved_path(label, path, &mut self.trap.writer);
748-
Some(())
749-
})();
702+
// TODO: remove method.
750703
}
751704

752705
pub(crate) fn extract_method_canonical_destination(
753706
&mut self,
754707
item: &ast::MethodCallExpr,
755708
label: Label<generated::MethodCallExpr>,
756709
) {
757-
if !self.resolve_paths {
758-
return;
759-
}
760-
(|| {
761-
let sema = self.semantics.as_ref()?;
762-
let resolved = sema.resolve_method_call_fallback(item)?;
763-
let (Either::Left(function), _) = resolved else {
764-
return None;
765-
};
766-
let origin = self.origin_from_hir(function);
767-
let path = self.canonical_path_from_hir(function)?;
768-
generated::Resolvable::emit_resolved_crate_origin(
769-
label.into(),
770-
origin,
771-
&mut self.trap.writer,
772-
);
773-
generated::Resolvable::emit_resolved_path(label.into(), path, &mut self.trap.writer);
774-
Some(())
775-
})();
710+
// TODO: remove method.
776711
}
777712

778713
pub(crate) fn should_be_excluded(&self, item: &impl ast::HasAttrs) -> bool {

0 commit comments

Comments
 (0)