Fix rebase conflicts

Author: lionel-

crates/ark/src/lsp/tests/goto_definition.rs

@@ -23,7 +23,7 @@ fn make_params(uri: lsp_types::Url, line: u32, character: u32) -> GotoDefinition
 }
 
 /// A state with several open files, each mirrored into `oak` like `did_open`
-/// does, so `source()` targets resolve through `file_by_url`.
+/// does, so `source()` targets resolve through `file_by_path`.
 fn make_state_with(files: &[(&Url, &str)]) -> WorldState {
     let mut state = WorldState::default();
     for (uri, code) in files {

crates/oak_db/src/db.rs

@@ -216,7 +216,7 @@ pub(crate) fn root_by_package_query(db: &dyn Db, pkg: Package) -> Option<Root> {
 /// The file-level analogue of [`root_by_package`]. Nested roots overlap on
 /// disk, so a file reachable from several roots is owned by the deepest one,
 /// matching the package tiebreak. Ownership is keyed on reachability (the
-/// file is in the root's [`root_url_index`]), not bare path prefix, so the
+/// file is in the root's [`root_path_index`]), not bare path prefix, so the
 /// owner always actually contains the file. That's what makes it safe for
 /// [`all_files`] to emit each file exactly once: the owner is guaranteed to
 /// visit it. A bare path prefix would name a freshly-added but not-yet-scanned