diff --git a/crates/base-db/src/change.rs b/crates/base-db/src/change.rs index 335c7840a62..f202a885e27 100644 --- a/crates/base-db/src/change.rs +++ b/crates/base-db/src/change.rs @@ -68,8 +68,8 @@ impl FileChange { let source_root = db.source_root(source_root_id); let durability = durability(&source_root); // XXX: can't actually remove the file, just reset the text - let text = text.as_ref().map(String::as_str).unwrap_or_else(|| ""); - db.set_file_text_with_durability(file_id, text, durability) + let text = text.unwrap_or_default(); + db.set_file_text_with_durability(file_id, &text, durability) } if let Some(crate_graph) = self.crate_graph { db.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH); diff --git a/crates/base-db/src/lib.rs b/crates/base-db/src/lib.rs index 69cd0eb3344..5dcb580723f 100644 --- a/crates/base-db/src/lib.rs +++ b/crates/base-db/src/lib.rs @@ -135,7 +135,7 @@ impl SourceDatabaseExt2 for Db { durability: Durability, ) { let bytes = text.as_bytes(); - let compressed = lz4_flex::compress_prepend_size(&bytes); + let compressed = lz4_flex::compress_prepend_size(bytes); self.set_compressed_file_text_with_durability( file_id, Arc::from(compressed.as_slice()), diff --git a/crates/test-fixture/src/lib.rs b/crates/test-fixture/src/lib.rs index a654366c62a..8cf65d11c6c 100644 --- a/crates/test-fixture/src/lib.rs +++ b/crates/test-fixture/src/lib.rs @@ -149,12 +149,12 @@ impl ChangeFixture { for entry in fixture { let text = if entry.text.contains(CURSOR_MARKER) { if entry.text.contains(ESCAPED_CURSOR_MARKER) { - entry.text.replace(ESCAPED_CURSOR_MARKER, CURSOR_MARKER).into() + entry.text.replace(ESCAPED_CURSOR_MARKER, CURSOR_MARKER) } else { let (range_or_offset, text) = extract_range_or_offset(&entry.text); assert!(file_position.is_none()); file_position = Some((file_id, range_or_offset)); - text.into() + text } } else { entry.text.as_str().into() @@ -251,7 +251,7 @@ impl ChangeFixture { fs.insert(core_file, VfsPath::new_virtual_path("/sysroot/core/lib.rs".to_owned())); roots.push(SourceRoot::new_library(fs)); - source_change.change_file(core_file, Some(mini_core.source_code().into())); + source_change.change_file(core_file, Some(mini_core.source_code())); let all_crates = crate_graph.crates_in_topological_order(); @@ -287,7 +287,7 @@ impl ChangeFixture { ); roots.push(SourceRoot::new_library(fs)); - source_change.change_file(proc_lib_file, Some(source.into())); + source_change.change_file(proc_lib_file, Some(source)); let all_crates = crate_graph.crates_in_topological_order();