dexoron/dcr
1
1
Fork 0
mirror of https://github.com/dexoron/dcr.git synced 2026-10-21 15:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: format code according to project standards

Browse Source
This commit is contained in:
peoplemiau1
2026-05-13 18:59:59 +03:00
parent cfc6be1e95
commit f507148849
4 changed files with 87 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/builder/gas.rs
View File

@@ -121,25 +121,27 @@ fn build_objects(
std::thread::scope(|s| { std::thread::scope(|s| {
for _ in 0..num_threads { for _ in 0..num_threads {
s.spawn(|| loop { s.spawn(|| {
if err_msg.lock().unwrap().is_some() { loop {
break; if err_msg.lock().unwrap().is_some() {
} break;
}
let i = counter.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
if i >= sources.len() { let i = counter.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
break; if i >= sources.len() {
} break;
}
let source = &sources[i];
let obj_path = &objects[i]; let source = &sources[i];
let obj_path = &objects[i];
if let Err(e) = build_object(assembler, source, obj_path, ctx) {
let mut err = err_msg.lock().unwrap(); if let Err(e) = build_object(assembler, source, obj_path, ctx) {
if err.is_none() { let mut err = err_msg.lock().unwrap();
*err = Some(e); if err.is_none() {
*err = Some(e);
}
break;
} }
break;
} }
}); });
} }

41
src/core/builder/msvc.rs
View File

@@ -206,25 +206,27 @@ fn build_objects(
std::thread::scope(|s| { std::thread::scope(|s| {
for _ in 0..num_threads { for _ in 0..num_threads {
s.spawn(|| loop { s.spawn(|| {
if err_msg.lock().unwrap().is_some() { loop {
break; if err_msg.lock().unwrap().is_some() {
} break;
}
let i = counter.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
if i >= sources.len() { let i = counter.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
break; if i >= sources.len() {
} break;
}
let source = &sources[i];
let obj_path = &objects[i]; let source = &sources[i];
let obj_path = &objects[i];
if let Err(e) = build_object(compiler, source, obj_path, ctx) {
let mut err = err_msg.lock().unwrap(); if let Err(e) = build_object(compiler, source, obj_path, ctx) {
if err.is_none() { let mut err = err_msg.lock().unwrap();
*err = Some(e); if err.is_none() {
*err = Some(e);
}
break;
} }
break;
} }
}); });
} }
@@ -304,7 +306,8 @@ fn build_object(
for line in stdout.lines() { for line in stdout.lines() {
if let Some(stripped) = line.strip_prefix("Note: including file:") { if let Some(stripped) = line.strip_prefix("Note: including file:") {
headers.push(stripped.trim().to_string()); headers.push(stripped.trim().to_string());
} else if let Some(stripped) = line.strip_prefix("Примечание: включение файла:") { } else if let Some(stripped) = line.strip_prefix("Примечание: включение файла:")
{
headers.push(stripped.trim().to_string()); headers.push(stripped.trim().to_string());
} else { } else {
clean_stdout.push_str(line); clean_stdout.push_str(line);

44
src/core/builder/nasm.rs
View File

@@ -122,25 +122,27 @@ fn build_objects(
std::thread::scope(|s| { std::thread::scope(|s| {
for _ in 0..num_threads { for _ in 0..num_threads {
s.spawn(|| loop { s.spawn(|| {
if err_msg.lock().unwrap().is_some() { loop {
break; if err_msg.lock().unwrap().is_some() {
} break;
}
let i = counter.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
if i >= sources.len() { let i = counter.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
break; if i >= sources.len() {
} break;
}
let source = &sources[i];
let obj_path = &objects[i]; let source = &sources[i];
let obj_path = &objects[i];
if let Err(e) = build_object(assembler, source, obj_path, format, ctx) {
let mut err = err_msg.lock().unwrap(); if let Err(e) = build_object(assembler, source, obj_path, format, ctx) {
if err.is_none() { let mut err = err_msg.lock().unwrap();
*err = Some(e); if err.is_none() {
*err = Some(e);
}
break;
} }
break;
} }
}); });
} }
@@ -169,7 +171,11 @@ fn build_object(
} }
let mut cmd = Command::new(assembler); let mut cmd = Command::new(assembler);
cmd.arg("-f").arg(format).arg(source).arg("-o").arg(obj_path); cmd.arg("-f")
.arg(format)
.arg(source)
.arg("-o")
.arg(obj_path);
for flag in ctx.cflags { for flag in ctx.cflags {
cmd.arg(flag); cmd.arg(flag);

38
src/core/builder/unix_cc.rs
View File

@@ -146,25 +146,27 @@ fn build_objects(
std::thread::scope(|s| { std::thread::scope(|s| {
for _ in 0..num_threads { for _ in 0..num_threads {
s.spawn(|| loop { s.spawn(|| {
if err_msg.lock().unwrap().is_some() { loop {
break; if err_msg.lock().unwrap().is_some() {
} break;
}
let i = counter.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
if i >= sources.len() { let i = counter.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
break; if i >= sources.len() {
} break;
}
let source = &sources[i];
let obj_path = &objects[i]; let source = &sources[i];
let obj_path = &objects[i];
if let Err(e) = build_object(compiler, source, obj_path, ctx) {
let mut err = err_msg.lock().unwrap(); if let Err(e) = build_object(compiler, source, obj_path, ctx) {
if err.is_none() { let mut err = err_msg.lock().unwrap();
*err = Some(e); if err.is_none() {
*err = Some(e);
}
break;
} }
break;
} }
}); });
} }