refactor(xtask): extract retained symbols

Author: mkroening

xtask/src/archive.rs

@@ -22,7 +22,37 @@ impl AsRef<Path> for Archive {
 }
 
 impl Archive {
-	pub fn syscall_symbols(&self) -> Result<Vec<String>> {
+	pub fn retain_kernel_symbols(&self) -> Result<()> {
+		eprintln!("Retaining kernel symbols");
+
+		let explicit_symbols = self.explicit_symbols().iter().copied();
+		let syscall_symbols = self.syscall_symbols()?;
+		let syscall_symbols = syscall_symbols.iter().map(String::as_str);
+
+		let symbols = explicit_symbols.chain(syscall_symbols).collect();
+		self.retain_symbols(symbols)?;
+
+		Ok(())
+	}
+
+	pub fn retain_builtin_symbols(&self) -> Result<()> {
+		eprintln!("Retaining hermit-builtins symbols");
+		let sh = crate::sh()?;
+
+		let builtin_symbols = sh.read_file("hermit-builtins/exports")?;
+		let builtin_symbols = builtin_symbols.lines();
+
+		let symbols = builtin_symbols.collect();
+		self.retain_symbols(symbols)?;
+
+		Ok(())
+	}
+
+	fn explicit_symbols(&self) -> &[&str] {
+		&["_start", "__bss_start", "mcount", "runtime_entry"]
+	}
+
+	fn syscall_symbols(&self) -> Result<Vec<String>> {
 		let sh = crate::sh()?;
 		let archive = self.as_ref();
 
@@ -40,7 +70,7 @@ impl Archive {
 		Ok(symbols)
 	}
 
-	pub fn retain_symbols(&self, mut exported_symbols: HashSet<&str>) -> Result<()> {
+	fn retain_symbols(&self, mut exported_symbols: HashSet<&str>) -> Result<()> {
 		let sh = crate::sh()?;
 		let archive = self.as_ref();
 		let prefix = {

xtask/src/build.rs

@@ -1,4 +1,3 @@
-use std::collections::HashSet;
 use std::env::{self, VarError};
 
 use anyhow::Result;
@@ -68,8 +67,7 @@ impl Build {
 		sh.create_dir(dist_archive.as_ref().parent().unwrap())?;
 		sh.copy_file(&build_archive, &dist_archive)?;
 
-		eprintln!("Exporting symbols");
-		self.export_syms()?;
+		self.cargo_build.artifact.dist_archive().retain_kernel_symbols()?;
 
 		eprintln!("Building hermit-builtins");
 		let mut cargo = crate::cargo();
@@ -85,11 +83,8 @@ impl Build {
 		let status = cargo.status()?;
 		assert!(status.success());
 
-		eprintln!("Exporting hermit-builtins symbols");
 		let builtins = self.cargo_build.artifact.builtins_archive();
-		let builtin_symbols = sh.read_file("hermit-builtins/exports")?;
-		builtins.retain_symbols(builtin_symbols.lines().collect::<HashSet<_>>())?;
-
+		builtins.retain_builtin_symbols()?;
 		dist_archive.append(&builtins)?;
 
 		eprintln!("Setting OSABI");
@@ -131,17 +126,4 @@ impl Build {
 
 		Ok(rustflags.join("\x1f"))
 	}
-
-	fn export_syms(&self) -> Result<()> {
-		let archive = self.cargo_build.artifact.dist_archive();
-
-		let syscall_symbols = archive.syscall_symbols()?;
-		let explicit_exports = ["_start", "__bss_start", "mcount", "runtime_entry"].into_iter();
-
-		let symbols = explicit_exports.chain(syscall_symbols.iter().map(String::as_str));
-
-		archive.retain_symbols(symbols.collect::<HashSet<_>>())?;
-
-		Ok(())
-	}
 }