bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-expand/src/files.rs')
-rw-r--r--crates/hir-expand/src/files.rs33
1 files changed, 6 insertions, 27 deletions
diff --git a/crates/hir-expand/src/files.rs b/crates/hir-expand/src/files.rs
index a7f3e27a45..fe557d6802 100644
--- a/crates/hir-expand/src/files.rs
+++ b/crates/hir-expand/src/files.rs
@@ -55,30 +55,6 @@ impl From<FilePosition> for HirFilePosition {
}
}
-impl FilePositionWrapper<span::FileId> {
- pub fn with_edition(self, db: &dyn ExpandDatabase, edition: span::Edition) -> FilePosition {
- FilePositionWrapper {
- file_id: EditionedFileId::new(db, self.file_id, edition),
- offset: self.offset,
- }
- }
-}
-
-impl FileRangeWrapper<span::FileId> {
- pub fn with_edition(self, db: &dyn ExpandDatabase, edition: span::Edition) -> FileRange {
- FileRangeWrapper {
- file_id: EditionedFileId::new(db, self.file_id, edition),
- range: self.range,
- }
- }
-}
-
-impl<T> InFileWrapper<span::FileId, T> {
- pub fn with_edition(self, db: &dyn ExpandDatabase, edition: span::Edition) -> InRealFile<T> {
- InRealFile { file_id: EditionedFileId::new(db, self.file_id, edition), value: self.value }
- }
-}
-
impl HirFileRange {
pub fn file_range(self) -> Option<FileRange> {
Some(FileRange { file_id: self.file_id.file_id()?, range: self.range })
@@ -407,7 +383,7 @@ impl InFile<SyntaxToken> {
// Fall back to whole macro call.
let loc = db.lookup_intern_macro_call(mac_file);
- loc.kind.original_call_range(db)
+ loc.kind.original_call_range(db, loc.krate)
}
}
}
@@ -453,7 +429,10 @@ impl InFile<TextRange> {
Some(it) => it,
None => {
let loc = db.lookup_intern_macro_call(mac_file);
- (loc.kind.original_call_range(db), SyntaxContext::root(loc.def.edition))
+ (
+ loc.kind.original_call_range(db, loc.krate),
+ SyntaxContext::root(loc.def.edition),
+ )
}
}
}
@@ -468,7 +447,7 @@ impl InFile<TextRange> {
Some(it) => it,
_ => {
let loc = db.lookup_intern_macro_call(mac_file);
- loc.kind.original_call_range(db)
+ loc.kind.original_call_range(db, loc.krate)
}
}
}