Skip to content

Commit

Permalink
chore: prettify
Browse files Browse the repository at this point in the history
  • Loading branch information
ThibaultRuby committed Jan 24, 2024
1 parent 0154d8f commit 22e6dcd
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
12 changes: 7 additions & 5 deletions src/ast_browser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,13 @@ fn process_typescript_file(path: String, actual_imports: &mut HashMap<String, Im
Some(src) => {
let line: usize;
match source_map.lookup_line(module.span.lo) {
Ok(source) => {
line = source.line
},
Ok(source) => line = source.line,
Err(_) => {
line = 0;
}
}
let name = utils::remove_first_and_last_chars(src.to_string());
let name =
utils::remove_first_and_last_chars(src.to_string());
let actual_import = ImportStatement {
name: name.clone(),
file: path.clone(),
Expand Down Expand Up @@ -111,7 +110,10 @@ fn process_typescript_file(path: String, actual_imports: &mut HashMap<String, Im
}
}

pub fn resolve_actual_imports(project_root: PathBuf, pattern: String) -> HashMap<String, ImportStatement> {
pub fn resolve_actual_imports(
project_root: PathBuf,
pattern: String,
) -> HashMap<String, ImportStatement> {
let mut actual_imports: HashMap<String, ImportStatement> = HashMap::new();
let absolute_pattern = Path::new(&project_root).join(pattern);
for entry in glob(&absolute_pattern.display().to_string()).expect("Failed to read glob pattern")
Expand Down
8 changes: 3 additions & 5 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ mod ast_browser;
mod manifest;
mod write_report;

use env_logger::{Builder, Target};
use log::{error, info};
use std::env;
use std::io::Write;
use std::string::String;
use log::{info, error};
use env_logger::{Builder, Target};

fn main() {
let args = Args::parse();
Expand Down Expand Up @@ -63,9 +63,7 @@ fn main() {
fn configure_logging(args: &Args) {
let mut logging_builder = Builder::from_default_env();

logging_builder.format(|buf, record| {
writeln!(buf, "{}", record.args())
});
logging_builder.format(|buf, record| writeln!(buf, "{}", record.args()));

if args.verbose {
logging_builder.filter_level(log::LevelFilter::Debug);
Expand Down
2 changes: 1 addition & 1 deletion src/manifest.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use log::info;
use std::collections::HashMap;
use std::collections::HashSet;
use std::env;
use std::fs;
use std::option::Option;
use std::path::{Path, PathBuf};
use log::{info};

use anyhow::{bail, Ok, Result};
use serde::{Deserialize, Serialize};
Expand Down
10 changes: 6 additions & 4 deletions src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::ast_browser::ImportStatement;
use regex::Regex;
use std::cmp::Ordering;
use std::collections::HashMap;
use crate::ast_browser::ImportStatement;

const BUILT_IN: [&str; 41] = [
"assert",
Expand Down Expand Up @@ -220,8 +220,8 @@ mod crop_dep_only_tests {
#[cfg(test)]
mod filtered_and_cropped_deps_tests {
use crate::ast_browser::utils::filtered_and_cropped_deps;
use std::collections::HashMap;
use crate::ast_browser::ImportStatement;
use std::collections::HashMap;

fn fake_dep(name: String) -> ImportStatement {
ImportStatement {
Expand Down Expand Up @@ -282,7 +282,10 @@ mod filtered_and_cropped_deps_tests {
base_deps.insert(simple_external_dep.clone(), fake_dep(simple_external_dep));
base_deps.insert(nested_external_dep.clone(), fake_dep(nested_external_dep));
base_deps.insert(internal_dep.clone(), fake_dep(internal_dep));
base_deps.insert(namespace_external_dep.clone(), fake_dep(namespace_external_dep));
base_deps.insert(
namespace_external_dep.clone(),
fake_dep(namespace_external_dep),
);

filtered_and_cropped_deps(&mut base_deps);

Expand All @@ -291,6 +294,5 @@ mod filtered_and_cropped_deps_tests {
assert!(base_deps.contains_key("node"));
assert!(base_deps.contains_key("@angular/core"));
assert!(base_deps.contains_key("@something/utils"));

}
}

0 comments on commit 22e6dcd

Please sign in to comment.