Rust: resolve clippy and rustc warnings

rust/extractor/src/archive.rs

@@ -1,5 +1,4 @@
 use crate::path;
-use anyhow;
 use log::{debug, warn};
 use std::fs;
 use std::path::{Path, PathBuf};

rust/extractor/src/config.rs

@@ -1,13 +1,11 @@
 use anyhow::Context;
-use clap::builder::PossibleValue;
 use clap::{ArgAction, Parser, ValueEnum};
 use codeql_extractor::trap;
 use figment::{
     providers::{Env, Serialized},
     Figment,
 };
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use serde_with;
+use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
 #[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, Clone, Copy, ValueEnum)]
@@ -19,11 +17,11 @@ pub enum Compression {
     Gzip,
 }
 
-impl Into<trap::Compression> for Compression {
-    fn into(self) -> trap::Compression {
-        match self {
-            Compression::None => trap::Compression::None,
-            Compression::Gzip => trap::Compression::Gzip,
+impl From<Compression> for trap::Compression {
+    fn from(val: Compression) -> Self {
+        match val {
+            Compression::None => Self::None,
+            Compression::Gzip => Self::Gzip,
         }
     }
 }
@@ -72,10 +70,10 @@ impl Config {
                 .inputs
                 .extend(inputs_list.split("\n").map(PathBuf::from));
         }
-        Ok(Figment::new()
+        Figment::new()
             .merge(Env::prefixed("CODEQL_EXTRACTOR_RUST_"))
             .merge(Serialized::defaults(cli_args))
             .extract()
-            .context("loading configuration")?)
+            .context("loading configuration")
     }
 }

rust/extractor/src/main.rs

@@ -1,16 +1,11 @@
 use crate::trap::TrapId;
 use anyhow::Context;
-use log;
 use ra_ap_hir::db::DefDatabase;
-use ra_ap_hir::sym::ge;
-use ra_ap_hir::AdtId::{EnumId, StructId, UnionId};
-use ra_ap_hir::{Crate, ModuleDefId};
+use ra_ap_hir::{Crate};
 use ra_ap_load_cargo::{load_workspace_at, LoadCargoConfig, ProcMacroServerChoice};
 use ra_ap_project_model::CargoConfig;
 use ra_ap_project_model::RustLibSource;
-use ra_ap_vfs::AbsPathBuf;
-use std::fs;
-use std::path::{Path, PathBuf};
+use std::path::{PathBuf};
 
 mod archive;
 mod config;

rust/extractor/src/translate.rs

@@ -1,18 +1,15 @@
 use crate::archive::Archiver;
 use crate::trap::{AsTrapKeyPart, TrapFile, TrapId};
 use crate::{generated, trap_key};
-use anyhow;
 use codeql_extractor::trap;
 use ra_ap_hir::HasSource;
 use ra_ap_hir::{Crate, Module, ModuleDef};
 use ra_ap_ide_db::line_index::LineIndex;
 use ra_ap_ide_db::{LineIndexDatabase, RootDatabase};
-use ra_ap_syntax::ast::HasName;
 use ra_ap_syntax::AstNode;
-use ra_ap_vfs::{AbsPath, FileId, Vfs};
+use ra_ap_vfs::{FileId, Vfs};
 use std::collections::HashMap;
 use std::fs;
-use std::io::Result;
 use std::path::PathBuf;
 use triomphe::Arc;
 
@@ -75,11 +72,11 @@ impl CrateTranslator<'_> {
             .source(self.db)
             .and_then(|source| source.file_id.file_id().map(|f| (f.file_id(), source)))
             .and_then(|(file_id, source)| self.emit_file(file_id).map(|data| (data, source)))
-            .and_then(|(data, source)| {
+            .map(|(data, source)| {
                 let range = source.value.syntax().text_range();
                 let start = data.line_index.line_col(range.start());
                 let end = data.line_index.line_col(range.end());
-                Some(self.trap.emit_location(data.label, start, end))
+                self.trap.emit_location(data.label, start, end)
             })
     }
 

rust/extractor/src/trap.rs

@@ -2,12 +2,10 @@ use crate::config::Compression;
 use crate::generated;
 use crate::{config, path};
 use codeql_extractor::trap;
-use log::{debug, trace};
+use log::{debug};
 use ra_ap_ide_db::line_index::LineCol;
 use std::ffi::OsString;
-use std::fmt::{Debug, Display, Formatter};
-use std::fs::File;
-use std::io::Write;
+use std::fmt::{Debug};
 use std::path::{Path, PathBuf};
 
 //TODO: typed labels