squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #1492

Browse source 
1492: Fix clippy::redundant_clone r=matklad a=sinkuu



Co-authored-by: Shotaro Yamada <sinkuu@sinkuu.xyz>
This commit is contained in:
bors[bot] 2019-07-05 06:41:09 +00:00
parent 21f70a7293 d0e9cd2bc6
commit 3be2d1db6c
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir/src/code_model.rs
View file

@ -169,7 +169,7 @@ impl ModuleSource {
(None, Some(item_id)) => {
let module = item_id.to_node(db);
assert!(module.item_list().is_some(), "expected inline module");
ModuleSource::Module(module.to_owned())
ModuleSource::Module(module)
}
(None, None) => panic!(),
}

3
crates/ra_hir/src/ty/infer.rs
View file

@ -895,8 +895,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
}
None => (receiver_ty, Ty::Unknown, None),
};
let substs =
self.substs_for_method_call(def_generics.clone(), generic_args, &derefed_receiver_ty);
let substs = self.substs_for_method_call(def_generics, generic_args, &derefed_receiver_ty);
let method_ty = method_ty.apply_substs(substs);
let method_ty = self.insert_type_vars(method_ty);
self.register_obligations_for_call(&method_ty);

2
crates/ra_ide_api/src/hover.rs
View file

@ -88,7 +88,7 @@ impl HoverResult {
fn hover_text(docs: Option<String>, desc: Option<String>) -> Option<String> {
match (desc, docs) {
(Some(desc), docs) => Some(rust_code_markup_with_doc(desc, docs)),
(None, Some(docs)) => Some(docs.to_string()),
(None, Some(docs)) => Some(docs),
_ => None,
}
}

4
crates/ra_ide_api/src/mock_analysis.rs
View file

@ -62,13 +62,13 @@ impl MockAnalysis {
pub fn add_file_with_position(&mut self, path: &str, text: &str) -> FilePosition {
let (offset, text) = extract_offset(text);
let file_id = FileId((self.files.len() + 1) as u32);
self.files.push((path.to_string(), text.to_string()));
self.files.push((path.to_string(), text));
FilePosition { file_id, offset }
}
pub fn add_file_with_range(&mut self, path: &str, text: &str) -> FileRange {
let (range, text) = extract_range(text);
let file_id = FileId((self.files.len() + 1) as u32);
self.files.push((path.to_string(), text.to_string()));
self.files.push((path.to_string(), text));
FileRange { file_id, range }
}
pub fn id_of(&self, path: &str) -> FileId {