Fix rebase conflicts

lionel- · lionel- · commit fa5b1c07d40b · 2026-06-11T14:40:41.000+02:00
diff --git a/crates/oak_db/src/file_resolve.rs b/crates/oak_db/src/file_resolve.rs
@@ -154,7 +154,7 @@ impl<'db> File {
             ..
         } = index.definitions(scope)[def_id].kind()
         {
-            let target = db.file_by_url(&FilePath::from_url(target_url))?;
+            let target = db.file_by_path(&FilePath::from_url(target_url))?;
             return target.resolve_export(db, Name::new(db, forwarded.as_str()));
         }
         self.definition(db, scope, def_id)

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ impl<'db> File {`
`154`	`154`	`..`
`155`	`155`	`} = index.definitions(scope)[def_id].kind()`
`156`	`156`	`{`
`157`		`- let target = db.file_by_url(&FilePath::from_url(target_url))?;`
	`157`	`+ let target = db.file_by_path(&FilePath::from_url(target_url))?;`
`158`	`158`	`return target.resolve_export(db, Name::new(db, forwarded.as_str()));`
`159`	`159`	`}`
`160`	`160`	`self.definition(db, scope, def_id)`