helios: Fixes after hare checkless for loops v1 APPLIED

Gilles Duboscq: 1
 Fixes after hare checkless for loops

 5 files changed, 0 insertions(+), 6 deletions(-)

[PATCH helios] Fixes after hare checkless for loops Export this patch

See https://git.sr.ht/~sircmpwn/harec/commit/d31057140ed3975dc258e9e25fca8105d3eec1de
---
I've seen this fail the automated build when submitting some other patch

 boot/+x86_64/rt.ha             | 2 --
 encoding/utf8/decode.ha        | 1 -
 log/fmt.ha                     | 1 -
 vulcan/encoding/utf8/decode.ha | 1 -
 vulcan/log/fmt.ha              | 1 -
 5 files changed, 6 deletions(-)

diff --git a/boot/+x86_64/rt.ha b/boot/+x86_64/rt.ha
index 4136401..5489783 100644
--- a/boot/+x86_64/rt.ha
@@ -1,7 +1,6 @@
 export @symbol("rt.abort") fn _abort(msg: str) never = {
 	writestr(msg);
 	for (true) void;
-	abort();
 };
 
 // See harec:include/gen.h
@@ -18,7 +17,6 @@ export @symbol("rt.abort_fixed") fn abort_fixed(loc: str, i: int) never = {
 	writestr(": ");
 	writestr(reasons[i]);
 	for (true) void;
-	abort();
 };
 
 export @symbol("rt.memset") fn memset(dest: *opaque, val: u8, amt: size) void = {
diff --git a/encoding/utf8/decode.ha b/encoding/utf8/decode.ha
index 57e697e..6d0dab7 100644
--- a/encoding/utf8/decode.ha
+++ b/encoding/utf8/decode.ha
@@ -106,7 +106,6 @@ export fn valid(src: (str | []u8)) bool = {
 		case rune => void;
 		};
 	};
-	abort();
 };
 
 // Returns the expected length of a UTF-8 character in bytes.
diff --git a/log/fmt.ha b/log/fmt.ha
index f10647f..6fdd60b 100644
--- a/log/fmt.ha
+++ b/log/fmt.ha
@@ -269,7 +269,6 @@ fn scan_uint(iter: *strings::iterator) uint = {
 			return strconv::stou(strings::fromutf8(num));
 		};
 	};
-	abort("unreachable");
 };
 
 fn scan_modifier_flags(iter: *strings::iterator, mod: *modifiers) void = {
diff --git a/vulcan/encoding/utf8/decode.ha b/vulcan/encoding/utf8/decode.ha
index cccbd80..eaae358 100644
--- a/vulcan/encoding/utf8/decode.ha
+++ b/vulcan/encoding/utf8/decode.ha
@@ -111,7 +111,6 @@ export fn valid(src: (str | []u8)) bool = {
 		case rune => void;
 		};
 	};
-	abort();
 };
 
 // Returns the expected length of a UTF-8 codepoint in bytes given its first
diff --git a/vulcan/log/fmt.ha b/vulcan/log/fmt.ha
index dd6c29d..b8e6eac 100644
--- a/vulcan/log/fmt.ha
+++ b/vulcan/log/fmt.ha
@@ -210,7 +210,6 @@ fn scan_uint(iter: *strings::iterator) uint = {
 			return strconv::stou(strings::fromutf8(num))!;
 		};
 	};
-	abort("unreachable");
 };
 
 fn scan_modifier_base(iter: *strings::iterator, mod: *modifiers) void = {
-- 
2.43.0

builds.sr.ht <builds@sr.ht>

11 months ago

helios/patches/.build.yml: SUCCESS in 48s

[Fixes after hare checkless for loops][0] from [Gilles Duboscq][1]

[0]: https://lists.sr.ht/~sircmpwn/helios-devel/patches/47687
[1]: mailto:gilles.m.duboscq@gmail.com

✓ #1113699 SUCCESS helios/patches/.build.yml https://builds.sr.ht/~sircmpwn/job/1113699

Drew DeVault <sir@cmpwn.com>

11 months ago

Thanks!

To git@git.sr.ht:~sircmpwn/helios
   b42edc2..b5719be  master -> master