language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

clippy::redudant_borrow

Browse source
This commit is contained in:
Maan2003 2021-06-13 09:24:16 +05:30
parent d6737e55fb
commit c9b4ac5be4
No known key found for this signature in database
GPG key ID: E9AF024BA63C70ED
114 changed files with 285 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/project_model/src/build_data.rs
View file

@ -184,7 +184,7 @@ impl WorkspaceBuildData {
// Copy-pasted from existing cargo_metadata. It seems like we
// should be using sered_stacker here?
let mut deserializer = serde_json::Deserializer::from_str(&line);
let mut deserializer = serde_json::Deserializer::from_str(line);
deserializer.disable_recursion_limit();
let message = Message::deserialize(&mut deserializer)
.unwrap_or(Message::TextLine(line.to_string()));

2
crates/project_model/src/cargo_workspace.rs
View file

@ -278,7 +278,7 @@ impl CargoWorkspace {
id, edition, name, manifest_path, version, metadata, ..
} = meta_pkg;
let meta = from_value::<PackageMetadata>(metadata.clone()).unwrap_or_default();
let is_member = ws_members.contains(&id);
let is_member = ws_members.contains(id);
let edition = edition
.parse::<Edition>()
.with_context(|| format!("Failed to parse edition {}", edition))?;

4
crates/project_model/src/sysroot.rs
View file

@ -142,12 +142,12 @@ fn discover_sysroot_src_dir(
log::debug!("RUST_SRC_PATH is set, but is invalid (no core: {:?}), ignoring", core);
}
get_rust_src(&sysroot_path)
get_rust_src(sysroot_path)
.or_else(|| {
let mut rustup = Command::new(toolchain::rustup());
rustup.current_dir(current_dir).args(&["component", "add", "rust-src"]);
utf8_stdout(rustup).ok()?;
get_rust_src(&sysroot_path)
get_rust_src(sysroot_path)
})
.ok_or_else(|| {
format_err!(

12
crates/project_model/src/workspace.rs
View file

@ -185,7 +185,7 @@ impl ProjectWorkspace {
pub fn load_detached_files(detached_files: Vec<AbsPathBuf>) -> Result<ProjectWorkspace> {
let sysroot = Sysroot::discover(
&detached_files.first().ok_or_else(|| format_err!("No detached files to load"))?,
detached_files.first().ok_or_else(|| format_err!("No detached files to load"))?,
)?;
let rustc_cfg = rustc_cfg::get(None, None);
Ok(ProjectWorkspace::DetachedFiles { files: detached_files, sysroot, rustc_cfg })
@ -324,7 +324,7 @@ impl ProjectWorkspace {
pub fn collect_build_data_configs(&self, collector: &mut BuildDataCollector) {
match self {
ProjectWorkspace::Cargo { cargo, .. } => {
collector.add_config(&cargo.workspace_root(), cargo.build_data_config().clone());
collector.add_config(cargo.workspace_root(), cargo.build_data_config().clone());
}
_ => {}
}
@ -348,7 +348,7 @@ fn project_json_to_crate_graph(
.crates()
.filter_map(|(crate_id, krate)| {
let file_path = &krate.root_module;
let file_id = load(&file_path)?;
let file_id = load(file_path)?;
Some((crate_id, krate, file_id))
})
.map(|(crate_id, krate, file_id)| {
@ -534,7 +534,7 @@ fn detached_files_to_crate_graph(
cfg_options.extend(rustc_cfg);
for detached_file in detached_files {
let file_id = match load(&detached_file) {
let file_id = match load(detached_file) {
Some(file_id) => file_id,
None => {
log::error!("Failed to load detached file {:?}", detached_file);
@ -602,7 +602,7 @@ fn handle_rustc_crates(
crate_graph,
&rustc_workspace[pkg],
rustc_build_data_map.and_then(|it| it.get(&rustc_workspace[pkg].id)),
&cfg_options,
cfg_options,
proc_macro_loader,
file_id,
&rustc_workspace[tgt].name,
@ -685,7 +685,7 @@ fn add_target_crate_root(
let proc_macro = build_data
.as_ref()
.and_then(|it| it.proc_macro_dylib_path.as_ref())
.map(|it| proc_macro_loader(&it))
.map(|it| proc_macro_loader(it))
.unwrap_or_default();
let display_name = CrateDisplayName::from_canonical_name(cargo_name.to_string());