diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-10-30 11:12:14 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-10-30 12:01:37 +0200 |
commit | cbf29a18ce56a929452c832f10c3ca3cc143a73c (patch) | |
tree | 4c66859b831ed759ac15b381d83ac45bdf18d6eb | |
parent | a8a14c41d818cb8c5ad6a78aca024b855231e027 (diff) | |
download | rebel-cbf29a18ce56a929452c832f10c3ca3cc143a73c.tar rebel-cbf29a18ce56a929452c832f10c3ca3cc143a73c.zip |
driver: context: more consistent use specification
-rw-r--r-- | crates/driver/src/context.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/crates/driver/src/context.rs b/crates/driver/src/context.rs index 4fcc3e5..ac7162d 100644 --- a/crates/driver/src/context.rs +++ b/crates/driver/src/context.rs @@ -16,11 +16,7 @@ use common::{ types::TaskID, }; -use crate::{ - args::{self, arg, Arg, ArgMapping, ArgType, PlatformRelation, TaskArgs}, - paths, - task::*, -}; +use crate::{args::*, paths, task::*}; #[derive(Debug, Clone, Copy)] pub enum ErrorKind<'ctx> { @@ -137,7 +133,7 @@ fn platform_relation(args: &TaskArgs, from: &str, to: &str) -> Option<PlatformRe #[derive(Debug)] pub struct Context { - platforms: HashMap<String, args::Arg>, + platforms: HashMap<String, Arg>, globals: TaskArgs, tasks: HashMap<TaskID, TaskDef>, } @@ -147,7 +143,7 @@ impl Context { let platforms: HashMap<_, _> = [ arg( "build", - args::Platform { + Platform { short: "build".to_string(), gnu_triplet: "x86_64-linux-gnu".to_string(), karch: "x86_64".to_string(), @@ -156,7 +152,7 @@ impl Context { ), arg( "aarch64", - args::Platform { + Platform { short: "aarch64".to_string(), gnu_triplet: "aarch64-linux-gnu".to_string(), karch: "arm64".to_string(), |