Skip to content

Clean up #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolandpeelen merged 2 commits into from
Nov 15, 2024
Merged

Clean up #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5075f64
:fire: - Drop unneeded files
rolandpeelen Nov 15, 2024
ea0e47e
:rotating_light: - Fix clippy suggestions
rolandpeelen Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
310 changes: 4 additions & 306 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,3 @@ clap-verbosity-flag = "2.2.2"
[profile.release]
codegen-units = 1
lto = true

[dev-dependencies]
criterion = "0.4"

[[bench]]
name = "base_bench"
harness = false
54 changes: 0 additions & 54 deletions benches/base_bench.rs
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions src/build/clean.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ pub fn cleanup_previous_build(
.get(package_name)
.expect("Could not find package");
remove_compile_assets(package, res_file_location);
remove_mjs_file(res_file_location, &suffix);
remove_mjs_file(res_file_location, suffix);
remove_iast(package, res_file_location);
remove_ast(package, res_file_location);
match helpers::get_extension(ast_file_path).as_str() {
Expand Down Expand Up @@ -234,14 +234,13 @@ pub fn cleanup_previous_build(

let deleted_module_names = ast_module_names
.difference(&all_module_names)
.map(|module_name| {
.flat_map(|module_name| {
// if the module is a namespace, we need to mark the whole namespace as dirty when a module has been deleted
if let Some(namespace) = helpers::get_namespace_from_module_name(module_name) {
return vec![namespace, module_name.to_string()];
}
vec![module_name.to_string()]
})
.flatten()
.collect::<AHashSet<String>>();

build_state.deleted_modules = deleted_module_names;
Expand Down
170 changes: 83 additions & 87 deletions src/build/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,10 @@ pub fn compile(
} else {
None
}
.map(|res| {
.inspect(|_res| {
if !(log_enabled!(Info)) {
inc();
}
res
})
})
.collect::<Vec<
Expand All @@ -236,103 +235,100 @@ pub fn compile(
)>,
>>()
.iter()
.for_each(|result| match result {
Some((module_name, result, interface_result, is_clean, is_compiled)) => {
in_progress_modules.remove(module_name);
.for_each(|result| if let Some((module_name, result, interface_result, is_clean, is_compiled)) = result {
in_progress_modules.remove(module_name);

if *is_compiled {
num_compiled_modules += 1;
}
if *is_compiled {
num_compiled_modules += 1;
}

files_current_loop_count += 1;
compiled_modules.insert(module_name.to_string());
files_current_loop_count += 1;
compiled_modules.insert(module_name.to_string());

if *is_clean {
// actually add it to a list of clean modules
clean_modules.insert(module_name.to_string());
}
if *is_clean {
// actually add it to a list of clean modules
clean_modules.insert(module_name.to_string());
}

let module_dependents = build_state.get_module(module_name).unwrap().dependents.clone();
let module_dependents = build_state.get_module(module_name).unwrap().dependents.clone();

// if not clean -- compile modules that depend on this module
for dep in module_dependents.iter() {
// if not clean -- compile modules that depend on this module
for dep in module_dependents.iter() {
// mark the reverse dep as dirty when the source is not clean
if !*is_clean {
let dep_module = build_state.modules.get_mut(dep).unwrap();
// mark the reverse dep as dirty when the source is not clean
if !*is_clean {
let dep_module = build_state.modules.get_mut(dep).unwrap();
// mark the reverse dep as dirty when the source is not clean
dep_module.compile_dirty = true;
}
if !compiled_modules.contains(dep) {
in_progress_modules.insert(dep.to_string());
}
dep_module.compile_dirty = true;
}
if !compiled_modules.contains(dep) {
in_progress_modules.insert(dep.to_string());
}
}

let module = build_state.modules.get_mut(module_name).unwrap();
let package = build_state
.packages
.get(&module.package_name)
.expect("Package not found");
match module.source_type {
SourceType::MlMap(ref mut mlmap) => {
module.compile_dirty = false;
mlmap.parse_dirty = false;
}
SourceType::SourceFile(ref mut source_file) => {
match result {
Ok(Some(err)) => {
source_file.implementation.compile_state = CompileState::Warning;
logs::append(package, err);
compile_warnings.push_str(err);
}
Ok(None) => {
source_file.implementation.compile_state = CompileState::Success;
}
Err(err) => {
source_file.implementation.compile_state = CompileState::Error;
logs::append(package, err);
compile_errors.push_str(err);
}
};
match interface_result {
Some(Ok(Some(err))) => {
source_file.interface.as_mut().unwrap().compile_state =
CompileState::Warning;
logs::append(package, err);
compile_warnings.push_str(err);
}
Some(Ok(None)) => {
if let Some(interface) = source_file.interface.as_mut() {
interface.compile_state = CompileState::Success;
}
let module = build_state.modules.get_mut(module_name).unwrap();
let package = build_state
.packages
.get(&module.package_name)
.expect("Package not found");
match module.source_type {
SourceType::MlMap(ref mut mlmap) => {
module.compile_dirty = false;
mlmap.parse_dirty = false;
}
SourceType::SourceFile(ref mut source_file) => {
match result {
Ok(Some(err)) => {
source_file.implementation.compile_state = CompileState::Warning;
logs::append(package, err);
compile_warnings.push_str(err);
}
Ok(None) => {
source_file.implementation.compile_state = CompileState::Success;
}
Err(err) => {
source_file.implementation.compile_state = CompileState::Error;
logs::append(package, err);
compile_errors.push_str(err);
}
};
match interface_result {
Some(Ok(Some(err))) => {
source_file.interface.as_mut().unwrap().compile_state =
CompileState::Warning;
logs::append(package, err);
compile_warnings.push_str(err);
}
Some(Ok(None)) => {
if let Some(interface) = source_file.interface.as_mut() {
interface.compile_state = CompileState::Success;
}
}

Some(Err(err)) => {
source_file.interface.as_mut().unwrap().compile_state =
CompileState::Error;
logs::append(package, err);
compile_errors.push_str(err);
}
_ => (),
};
match (result, interface_result) {
// successfull compilation
(Ok(None), Some(Ok(None))) | (Ok(None), None) => {
module.compile_dirty = false;
module.last_compiled_cmi = Some(SystemTime::now());
module.last_compiled_cmt = Some(SystemTime::now());
}
// some error or warning
(Err(_), _)
| (_, Some(Err(_)))
| (Ok(Some(_)), _)
| (_, Some(Ok(Some(_)))) => {
module.compile_dirty = true;
}
Some(Err(err)) => {
source_file.interface.as_mut().unwrap().compile_state =
CompileState::Error;
logs::append(package, err);
compile_errors.push_str(err);
}
_ => (),
};
match (result, interface_result) {
// successfull compilation
(Ok(None), Some(Ok(None))) | (Ok(None), None) => {
module.compile_dirty = false;
module.last_compiled_cmi = Some(SystemTime::now());
module.last_compiled_cmt = Some(SystemTime::now());
}
// some error or warning
(Err(_), _)
| (_, Some(Err(_)))
| (Ok(Some(_)), _)
| (_, Some(Ok(Some(_)))) => {
module.compile_dirty = true;
}
}
}
}
None => (),
});

files_total_count += files_current_loop_count;
Expand Down Expand Up @@ -388,7 +384,7 @@ pub fn compiler_args(
// .unwrap_or(&vec![])
// .to_owned();

let deps = vec![normal_deps]
let deps = [normal_deps]
.concat()
.par_iter()
.map(|package_name| {
Expand Down Expand Up @@ -455,7 +451,7 @@ pub fn compiler_args(
_ => vec![],
};

vec![warn_number, warn_error].concat()
[warn_number, warn_error].concat()
}
};

Expand Down
19 changes: 8 additions & 11 deletions src/build/deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,15 @@ pub fn get_deps(build_state: &mut BuildState, deleted_modules: &AHashSet<String>
all_mod,
);

match &source_file.interface {
Some(interface) => {
let iast_path = package.get_iast_path(&interface.path);
if let Some(interface) = &source_file.interface {
let iast_path = package.get_iast_path(&interface.path);

deps.extend(get_dep_modules(
&iast_path,
package.namespace.to_suffix(),
package.modules.as_ref().unwrap(),
all_mod,
))
}
None => (),
deps.extend(get_dep_modules(
&iast_path,
package.namespace.to_suffix(),
package.modules.as_ref().unwrap(),
all_mod,
))
}
match &package.namespace {
packages::Namespace::NamespaceWithEntry { namespace: _, entry }
Expand Down
Loading
Loading