Clippy fixes

This commit is contained in:
Laurențiu Nicola 2024-02-14 13:34:29 +02:00
parent a12ccd5923
commit 717ba1d56a
3 changed files with 7 additions and 7 deletions

View File

@ -68,8 +68,8 @@ impl FileChange {
let source_root = db.source_root(source_root_id); let source_root = db.source_root(source_root_id);
let durability = durability(&source_root); let durability = durability(&source_root);
// XXX: can't actually remove the file, just reset the text // XXX: can't actually remove the file, just reset the text
let text = text.as_ref().map(String::as_str).unwrap_or_else(|| ""); let text = text.unwrap_or_default();
db.set_file_text_with_durability(file_id, text, durability) db.set_file_text_with_durability(file_id, &text, durability)
} }
if let Some(crate_graph) = self.crate_graph { if let Some(crate_graph) = self.crate_graph {
db.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH); db.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH);

View File

@ -135,7 +135,7 @@ impl<Db: ?Sized + SourceDatabaseExt> SourceDatabaseExt2 for Db {
durability: Durability, durability: Durability,
) { ) {
let bytes = text.as_bytes(); 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( self.set_compressed_file_text_with_durability(
file_id, file_id,
Arc::from(compressed.as_slice()), Arc::from(compressed.as_slice()),

View File

@ -149,12 +149,12 @@ impl ChangeFixture {
for entry in fixture { for entry in fixture {
let text = if entry.text.contains(CURSOR_MARKER) { let text = if entry.text.contains(CURSOR_MARKER) {
if entry.text.contains(ESCAPED_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 { } else {
let (range_or_offset, text) = extract_range_or_offset(&entry.text); let (range_or_offset, text) = extract_range_or_offset(&entry.text);
assert!(file_position.is_none()); assert!(file_position.is_none());
file_position = Some((file_id, range_or_offset)); file_position = Some((file_id, range_or_offset));
text.into() text
} }
} else { } else {
entry.text.as_str().into() 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())); fs.insert(core_file, VfsPath::new_virtual_path("/sysroot/core/lib.rs".to_owned()));
roots.push(SourceRoot::new_library(fs)); 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(); let all_crates = crate_graph.crates_in_topological_order();
@ -287,7 +287,7 @@ impl ChangeFixture {
); );
roots.push(SourceRoot::new_library(fs)); 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(); let all_crates = crate_graph.crates_in_topological_order();