hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rust: remove unnecessary field

Browse Source
This commit is contained in:
Arthur Baars
2024-10-28 18:32:49 +01:00
parent b6c26debef
commit c87f2c4eb1
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust/extractor/src/main.rs
View File

@@ -114,18 +114,18 @@ fn main() -> anyhow::Result<()> {
}
if let Some((ref db, ref vfs)) = RustAnalyzer::load_workspace(manifest, &cfg.scratch_dir) {
let semantics = Semantics::new(db);
let rust_analyzer = RustAnalyzer::new(db, vfs, semantics);
let rust_analyzer = RustAnalyzer::new(vfs, semantics);
for file in files {
extract(&rust_analyzer, &archiver, &traps, file);
}
} else {
for file in files {
extract(&RustAnalyzer::WithoutDatabase(), &archiver, &traps, file);
extract(&RustAnalyzer::WithoutSemantics, &archiver, &traps, file);
}
}
}
for file in other_files {
extract(&RustAnalyzer::WithoutDatabase(), &archiver, &traps, file);
extract(&RustAnalyzer::WithoutSemantics, &archiver, &traps, file);
}
Ok(())

24
rust/extractor/src/rust_analyzer.rs
View File

@@ -21,12 +21,11 @@ use std::borrow::Cow;
use std::path::{Path, PathBuf};
use triomphe::Arc;
pub enum RustAnalyzer<'a> {
WithDatabase {
db: &'a RootDatabase,
WithSemantics {
vfs: &'a Vfs,
semantics: Semantics<'a, RootDatabase>,
},
WithoutDatabase(),
WithoutSemantics,
}
pub struct ParseResult {
pub ast: SourceFile,
@@ -62,31 +61,28 @@ impl<'a> RustAnalyzer<'a> {
}
}
}
pub fn new(db: &'a RootDatabase, vfs: &'a Vfs, semantics: Semantics<'a, RootDatabase>) -> Self {
RustAnalyzer::WithDatabase { db, vfs, semantics }
pub fn new(vfs: &'a Vfs, semantics: Semantics<'a, RootDatabase>) -> Self {
RustAnalyzer::WithSemantics { vfs, semantics }
}
pub fn semantics(&'a self) -> Option<&'a Semantics<'a, RootDatabase>> {
match self {
RustAnalyzer::WithDatabase {
db: _,
vfs: _,
semantics,
} => Some(semantics),
RustAnalyzer::WithoutDatabase() => None,
RustAnalyzer::WithSemantics { vfs: _, semantics } => Some(semantics),
RustAnalyzer::WithoutSemantics => None,
}
}
pub fn parse(&self, path: &Path) -> ParseResult {
if let RustAnalyzer::WithDatabase { vfs, db, semantics } = self {
if let RustAnalyzer::WithSemantics { vfs, semantics } = self {
if let Some(file_id) = Utf8PathBuf::from_path_buf(path.to_path_buf())
.ok()
.and_then(|x| AbsPathBuf::try_from(x).ok())
.map(VfsPath::from)
.and_then(|x| vfs.file_id(&x))
{
let input: Arc<str> = db.file_text(file_id);
let input: Arc<str> = semantics.db.file_text(file_id);
let file_id = EditionedFileId::current_edition(file_id);
let source_file = semantics.parse(file_id);
let errors = db
let errors = semantics
.db
.parse_errors(file_id)
.into_iter()
.flat_map(|x| x.to_vec())