From f88622fab7dd04c17233ddf390e05e3fc8a0ae81 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 1 Aug 2022 11:21:34 -0500
Subject: [PATCH] sequences: use index-of-last more places

---
 basis/urls/urls.factor          | 2 +-
 core/sequences/sequences.factor | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/basis/urls/urls.factor b/basis/urls/urls.factor
index b9f23f4641..c78a44bd4e 100644
--- a/basis/urls/urls.factor
+++ b/basis/urls/urls.factor
@@ -120,7 +120,7 @@ M: pathname >url string>> >url ;
 
 : ipv6-host ( host -- host/ipv6 ipv6? )
     dup { [ "[" head? ] [ "]" tail? ] } 1&& [
-        1 swap [ length 1 - ] [ subseq ] bi t
+        1 swap index-of-last subseq t
     ] [ f ] if ;
 
 : unparse-host ( url -- host )
diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index b70ffec32b..5a8ef341ee 100644
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -825,7 +825,7 @@ PRIVATE>
 <PRIVATE
 
 : last-unsafe ( seq -- elt )
-    [ length 1 - ] [ nth-unsafe ] bi ; inline
+    index-of-last nth-unsafe ; inline
 
 PRIVATE>
 
@@ -833,7 +833,7 @@ PRIVATE>
     index-of-last
     over 0 < [ bounds-error ] [ set-nth-unsafe ] if ; inline
 
-: pop* ( seq -- ) [ length 1 - ] [ shorten ] bi ;
+: pop* ( seq -- ) index-of-last shorten ;
 
 <PRIVATE
 
-- 
2.34.1