summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2021-10-28 18:29:57 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2021-10-28 18:31:02 +0200
commit86f4c08b81e2129b5d1012c1350e68e3c0560282 (patch)
tree750c520fcf6518d96a51d84dd279e437203518d1
parentb35a75f4cb5417bb464639079d266fd708549b32 (diff)
downloadrebel-86f4c08b81e2129b5d1012c1350e68e3c0560282.tar
rebel-86f4c08b81e2129b5d1012c1350e68e3c0560282.zip
Rename executor to driver
-rw-r--r--crates/driver/Cargo.toml (renamed from crates/executor/Cargo.toml)0
-rw-r--r--crates/driver/src/args.rs (renamed from crates/executor/src/args.rs)0
-rw-r--r--crates/driver/src/context.rs (renamed from crates/executor/src/context.rs)0
-rw-r--r--crates/driver/src/driver.rs (renamed from crates/executor/src/executor.rs)14
-rw-r--r--crates/driver/src/main.rs (renamed from crates/executor/src/main.rs)6
-rw-r--r--crates/driver/src/recipe.rs (renamed from crates/executor/src/recipe.rs)0
-rw-r--r--crates/driver/src/resolve.rs (renamed from crates/executor/src/resolve.rs)0
-rw-r--r--crates/driver/src/task.rs (renamed from crates/executor/src/task.rs)0
-rw-r--r--crates/driver/src/template.rs (renamed from crates/executor/src/template.rs)0
9 files changed, 10 insertions, 10 deletions
diff --git a/crates/executor/Cargo.toml b/crates/driver/Cargo.toml
index 215c451..215c451 100644
--- a/crates/executor/Cargo.toml
+++ b/crates/driver/Cargo.toml
diff --git a/crates/executor/src/args.rs b/crates/driver/src/args.rs
index 510a156..510a156 100644
--- a/crates/executor/src/args.rs
+++ b/crates/driver/src/args.rs
diff --git a/crates/executor/src/context.rs b/crates/driver/src/context.rs
index daed230..daed230 100644
--- a/crates/executor/src/context.rs
+++ b/crates/driver/src/context.rs
diff --git a/crates/executor/src/executor.rs b/crates/driver/src/driver.rs
index 748ff89..f43f8e8 100644
--- a/crates/executor/src/executor.rs
+++ b/crates/driver/src/driver.rs
@@ -138,7 +138,7 @@ impl<'ctx> CompletionState<'ctx> {
}
#[derive(Debug)]
-pub struct Executor<'ctx> {
+pub struct Driver<'ctx> {
rdeps: HashMap<TaskRef<'ctx>, Vec<TaskRef<'ctx>>>,
tasks_blocked: HashSet<TaskRef<'ctx>>,
tasks_runnable: Vec<TaskRef<'ctx>>,
@@ -146,9 +146,9 @@ pub struct Executor<'ctx> {
state: CompletionState<'ctx>,
}
-impl<'ctx> Executor<'ctx> {
+impl<'ctx> Driver<'ctx> {
pub fn new(ctx: &'ctx Context, taskset: HashSet<TaskRef<'ctx>>) -> Result<Self> {
- let mut exc = Executor {
+ let mut driver = Driver {
rdeps: Default::default(),
tasks_blocked: Default::default(),
tasks_runnable: Default::default(),
@@ -161,19 +161,19 @@ impl<'ctx> Executor<'ctx> {
for dep in resolve::get_dependent_tasks(ctx, &task)
.map_err(|_| Error::new(format!("invalid dependency for {}", task)))?
{
- let rdep = exc.rdeps.entry(dep.clone()).or_default();
+ let rdep = driver.rdeps.entry(dep.clone()).or_default();
rdep.push(task.clone());
has_depends = true;
}
if has_depends {
- exc.tasks_blocked.insert(task);
+ driver.tasks_blocked.insert(task);
} else {
- exc.tasks_runnable.push(task);
+ driver.tasks_runnable.push(task);
}
}
- Ok(exc)
+ Ok(driver)
}
fn task_setup(task_ref: &TaskRef<'ctx>) -> Vec<&'static str> {
diff --git a/crates/executor/src/main.rs b/crates/driver/src/main.rs
index 6360e69..286480d 100644
--- a/crates/executor/src/main.rs
+++ b/crates/driver/src/main.rs
@@ -1,6 +1,6 @@
mod args;
mod context;
-mod executor;
+mod driver;
mod recipe;
mod resolve;
mod task;
@@ -48,8 +48,8 @@ fn main() {
}
}
let taskset = rsv.into_taskset();
- let mut exc = executor::Executor::new(&ctx, taskset).unwrap();
- if let Err(error) = exc.run(&runner) {
+ let mut driver = driver::Driver::new(&ctx, taskset).unwrap();
+ if let Err(error) = driver.run(&runner) {
eprintln!("{}", error);
std::process::exit(1);
}
diff --git a/crates/executor/src/recipe.rs b/crates/driver/src/recipe.rs
index 04f356b..04f356b 100644
--- a/crates/executor/src/recipe.rs
+++ b/crates/driver/src/recipe.rs
diff --git a/crates/executor/src/resolve.rs b/crates/driver/src/resolve.rs
index 338ce3f..338ce3f 100644
--- a/crates/executor/src/resolve.rs
+++ b/crates/driver/src/resolve.rs
diff --git a/crates/executor/src/task.rs b/crates/driver/src/task.rs
index fe9572c..fe9572c 100644
--- a/crates/executor/src/task.rs
+++ b/crates/driver/src/task.rs
diff --git a/crates/executor/src/template.rs b/crates/driver/src/template.rs
index b663e7d..b663e7d 100644
--- a/crates/executor/src/template.rs
+++ b/crates/driver/src/template.rs