driver: rename task_setup() to task_preamble(), improve code style

Less and consistent indentation by turning the strings into consts.

1 files changed, 68 insertions, 65 deletions

diff --git a/crates/driver/src/driver.rs b/crates/driver/src/driver.rs
index 212f4cf..b2655c6 100644
--- a/crates/driver/src/driver.rs
+++ b/crates/driver/src/driver.rs
@@ -204,74 +204,77 @@ impl<'ctx> Driver<'ctx> {
 		Ok(driver)
 	}
 
-	fn task_setup(task_ref: &TaskRef<'ctx>) -> Vec<&'static str> {
-		let mut ret = vec![indoc! {"
-			export PATH={{build.prefix}}/sbin:{{build.prefix}}/bin:$PATH
-			cd {{workdir}}
-
-			export SOURCE_DATE_EPOCH=1
-
-			export AR_FOR_BUILD=ar
-			export AS_FOR_BUILD=as
-			export DLLTOOL_FOR_BUILD=dlltool
-			export CC_FOR_BUILD=gcc
-			export CXX_FOR_BUILD=g++
-			export GCC_FOR_BUILD=gcc
-			export GFORTRAN_FOR_BUILD=gfortran
-			export GOC_FOR_BUILD=goc
-			export LD_FOR_BUILD=ld
-			export LIPO_FOR_BUILD=lipo
-			export NM_FOR_BUILD=nm
-			export OBJCOPY_FOR_BUILD=objcopy
-			export OBJDUMP_FOR_BUILD=objdump
-			export RANLIB_FOR_BUILD=ranlib
-			export STRIP_FOR_BUILD=strip
-			export WINDRES_FOR_BUILD=windres
-			export WINDMC_FOR_BUILD=windmc
-		"}];
+	const PREAMBLE: &'static str = indoc! {"
+		export PATH={{build.prefix}}/sbin:{{build.prefix}}/bin:$PATH
+		cd {{workdir}}
+
+		export SOURCE_DATE_EPOCH=1
+
+		export AR_FOR_BUILD=ar
+		export AS_FOR_BUILD=as
+		export DLLTOOL_FOR_BUILD=dlltool
+		export CC_FOR_BUILD=gcc
+		export CXX_FOR_BUILD=g++
+		export GCC_FOR_BUILD=gcc
+		export GFORTRAN_FOR_BUILD=gfortran
+		export GOC_FOR_BUILD=goc
+		export LD_FOR_BUILD=ld
+		export LIPO_FOR_BUILD=lipo
+		export NM_FOR_BUILD=nm
+		export OBJCOPY_FOR_BUILD=objcopy
+		export OBJDUMP_FOR_BUILD=objdump
+		export RANLIB_FOR_BUILD=ranlib
+		export STRIP_FOR_BUILD=strip
+		export WINDRES_FOR_BUILD=windres
+		export WINDMC_FOR_BUILD=windmc
+	"};
+	const PREAMBLE_HOST: &'static str = indoc! {"
+		export AR={{build_to_host.cross_compile}}ar
+		export AS={{build_to_host.cross_compile}}as
+		export DLLTOOL={{build_to_host.cross_compile}}dlltool
+		export CC={{build_to_host.cross_compile}}gcc
+		export CXX={{build_to_host.cross_compile}}g++
+		export GCC={{build_to_host.cross_compile}}gcc
+		export GFORTRAN={{build_to_host.cross_compile}}gfortran
+		export GOC={{build_to_host.cross_compile}}goc
+		export LD={{build_to_host.cross_compile}}ld
+		export LIPO={{build_to_host.cross_compile}}lipo
+		export NM={{build_to_host.cross_compile}}nm
+		export OBJCOPY={{build_to_host.cross_compile}}objcopy
+		export OBJDUMP={{build_to_host.cross_compile}}objdump
+		export RANLIB={{build_to_host.cross_compile}}ranlib
+		export STRIP={{build_to_host.cross_compile}}strip
+		export WINDRES={{build_to_host.cross_compile}}windres
+		export WINDMC={{build_to_host.cross_compile}}windmc
+	"};
+	const PREAMBLE_TARGET: &'static str = indoc! {"
+		export AR_FOR_TARGET={{build_to_target.cross_compile}}ar
+		export AS_FOR_TARGET={{build_to_target.cross_compile}}as
+		export DLLTOOL_FOR_TARGET={{build_to_target.cross_compile}}dlltool
+		export CC_FOR_TARGET={{build_to_target.cross_compile}}gcc
+		export CXX_FOR_TARGET={{build_to_target.cross_compile}}g++
+		export GCC_FOR_TARGET={{build_to_target.cross_compile}}gcc
+		export GFORTRAN_FOR_TARGET={{build_to_target.cross_compile}}gfortran
+		export GOC_FOR_TARGET={{build_to_target.cross_compile}}goc
+		export LD_FOR_TARGET={{build_to_target.cross_compile}}ld
+		export LIPO_FOR_TARGET={{build_to_target.cross_compile}}lipo
+		export NM_FOR_TARGET={{build_to_target.cross_compile}}nm
+		export OBJCOPY_FOR_TARGET={{build_to_target.cross_compile}}objcopy
+		export OBJDUMP_FOR_TARGET={{build_to_target.cross_compile}}objdump
+		export RANLIB_FOR_TARGET={{build_to_target.cross_compile}}ranlib
+		export STRIP_FOR_TARGET={{build_to_target.cross_compile}}strip
+		export WINDRES_FOR_TARGET={{build_to_target.cross_compile}}windres
+		export WINDMC_FOR_TARGET={{build_to_target.cross_compile}}windmc
+	"};
+
+	fn task_preamble(task_ref: &TaskRef<'ctx>) -> Vec<&'static str> {
+		let mut ret = vec![Self::PREAMBLE];
 
 		if task_ref.args.contains_key("build_to_host") {
-			ret.push(indoc! {"
-				export AR={{build_to_host.cross_compile}}ar
-				export AS={{build_to_host.cross_compile}}as
-				export DLLTOOL={{build_to_host.cross_compile}}dlltool
-				export CC={{build_to_host.cross_compile}}gcc
-				export CXX={{build_to_host.cross_compile}}g++
-				export GCC={{build_to_host.cross_compile}}gcc
-				export GFORTRAN={{build_to_host.cross_compile}}gfortran
-				export GOC={{build_to_host.cross_compile}}goc
-				export LD={{build_to_host.cross_compile}}ld
-				export LIPO={{build_to_host.cross_compile}}lipo
-				export NM={{build_to_host.cross_compile}}nm
-				export OBJCOPY={{build_to_host.cross_compile}}objcopy
-				export OBJDUMP={{build_to_host.cross_compile}}objdump
-				export RANLIB={{build_to_host.cross_compile}}ranlib
-				export STRIP={{build_to_host.cross_compile}}strip
-				export WINDRES={{build_to_host.cross_compile}}windres
-				export WINDMC={{build_to_host.cross_compile}}windmc
-			"});
+			ret.push(Self::PREAMBLE_HOST);
 		}
-
 		if task_ref.args.contains_key("build_to_target") {
-			ret.push(indoc! {"
-				export AR_FOR_TARGET={{build_to_target.cross_compile}}ar
-				export AS_FOR_TARGET={{build_to_target.cross_compile}}as
-				export DLLTOOL_FOR_TARGET={{build_to_target.cross_compile}}dlltool
-				export CC_FOR_TARGET={{build_to_target.cross_compile}}gcc
-				export CXX_FOR_TARGET={{build_to_target.cross_compile}}g++
-				export GCC_FOR_TARGET={{build_to_target.cross_compile}}gcc
-				export GFORTRAN_FOR_TARGET={{build_to_target.cross_compile}}gfortran
-				export GOC_FOR_TARGET={{build_to_target.cross_compile}}goc
-				export LD_FOR_TARGET={{build_to_target.cross_compile}}ld
-				export LIPO_FOR_TARGET={{build_to_target.cross_compile}}lipo
-				export NM_FOR_TARGET={{build_to_target.cross_compile}}nm
-				export OBJCOPY_FOR_TARGET={{build_to_target.cross_compile}}objcopy
-				export OBJDUMP_FOR_TARGET={{build_to_target.cross_compile}}objdump
-				export RANLIB_FOR_TARGET={{build_to_target.cross_compile}}ranlib
-				export STRIP_FOR_TARGET={{build_to_target.cross_compile}}strip
-				export WINDRES_FOR_TARGET={{build_to_target.cross_compile}}windres
-				export WINDMC_FOR_TARGET={{build_to_target.cross_compile}}windmc
-			"});
+			ret.push(Self::PREAMBLE_TARGET);
 		}
 		ret
 	}
@@ -315,7 +318,7 @@ impl<'ctx> Driver<'ctx> {
 
 		let ancestors = self.state.task_ancestors(task_ref);
 
-		let mut run = Self::task_setup(task_ref);
+		let mut run = Self::task_preamble(task_ref);
 		run.push(&task_def.action.run);
 
 		let command = template::ENGINE