thp: Build thp with Hare dev+9fec2b33 v1 APPLIED

Carlos Une: 1
 Build thp with Hare dev+9fec2b33

 2 files changed, 4 insertions(+), 4 deletions(-)

[PATCH thp] Build thp with Hare dev+9fec2b33 Export this patch

---
 mods/+uptime.ha | 6 +++---
 term/shell.ha   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mods/+uptime.ha b/mods/+uptime.ha
index 3763024..8d3e3b8 100644
--- a/mods/+uptime.ha
+++ b/mods/+uptime.ha
@@ -14,7 +14,7 @@ use os;
 use strconv;
 use strings;
 use strings::template;
-use strio;
+use memio;
 
 @init fn register_uptime() void = {
 	register("uptime", &mod_uptime);
@@ -73,11 +73,11 @@ export fn mod_uptime(pe: *env::env) str = {
 	};
 	defer template::finish(&template);
 
-	let sink = strio::dynamic();
+	let sink = memio::dynamic();
 	match (template::execute(&template, &sink, ("m", days/30), ("D", days),
 		("d", days % 30), ("H", hours), ("M", minutes), ("S", seconds))) {
 	case size =>
-		return strio::string(&sink);
+		return memio::string(&sink)!;
 	case io::error =>
 		return strings::dup("template::execute() failed");
 	};
diff --git a/term/shell.ha b/term/shell.ha
index 98c9305..977ba09 100644
--- a/term/shell.ha
+++ b/term/shell.ha
@@ -31,7 +31,7 @@ export fn wrapstr(s: str, pe: *env::env) str = {
 };
 
 export fn wraps(s: style, pe: *env::env) str = {
-	const ps = strings::concat(s.props...);
+	const ps = strings::concat(s.props: []str...);
 	defer free(ps);
 	const ps = strings::concat(s.fg, s.bg, ps);
 	defer free (ps);
-- 
2.30.2

Tom Regner <tomte@tomsdiner.org>

1 year, 1 month ago

Thanks!