From 7eee21ab94fe99bcc0f617578ecd8d16e7f91c51 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Thu, 5 Mar 2020 09:33:41 -0800
Subject: [PATCH] vocabs.metadata: cleanup a couple uses of metadata paths.

---
 basis/editors/editors.factor |  8 ++++----
 extra/fuel/fuel.factor       | 19 +++++--------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/basis/editors/editors.factor b/basis/editors/editors.factor
index 5efafdbb7e..a34dfbf8bc 100644
--- a/basis/editors/editors.factor
+++ b/basis/editors/editors.factor
@@ -116,13 +116,13 @@ M: object edit-tests
 M: word edit-tests vocabulary>> edit-tests ;
 
 : edit-platforms ( vocab -- )
-    dup vocab-platforms-path vocab-append-path 1 edit-location ;
+    public-vocab-name vocab-platforms-path 1 edit-location ;
 
 : edit-authors ( vocab -- )
-    dup vocab-authors-path vocab-append-path 1 edit-location ;
+    public-vocab-name vocab-authors-path 1 edit-location ;
 
 : edit-tags ( vocab -- )
-    dup vocab-tags-path vocab-append-path 1 edit-location ;
+    public-vocab-name vocab-tags-path 1 edit-location ;
 
 : edit-summary ( vocab -- )
-    dup vocab-summary-path vocab-append-path 1 edit-location ;
+    public-vocab-name vocab-summary-path 1 edit-location ;
diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor
index 585c5f46ef..f32fcc87a1 100644
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@ -155,32 +155,23 @@ PRIVATE>
 
 : fuel-scaffold-tests ( name devname -- result )
     [ scaffold-name dup require dup scaffold-tests ] with-scope
-    vocab-tests-file absolute-path ;
+    vocab-tests-path absolute-path ;
 
 : fuel-scaffold-authors ( name devname -- result )
     [ scaffold-name dup require dup scaffold-authors ] with-scope
-    [ vocab-authors-path ] keep swap vocab-append-path absolute-path ;
+    vocab-authors-path absolute-path ;
 
 : fuel-scaffold-tags ( name tags -- result )
     [ scaffold-tags ]
-    [
-        drop [ vocab-tags-path ] keep swap
-        vocab-append-path absolute-path
-    ] 2bi ;
+    [ drop vocab-tags-path absolute-path ] 2bi ;
 
 : fuel-scaffold-summary ( name summary -- result )
     [ scaffold-summary ]
-    [
-        drop [ vocab-summary-path ] keep swap
-        vocab-append-path absolute-path
-    ] 2bi ;
+    [ drop vocab-summary-path absolute-path ] 2bi ;
 
 : fuel-scaffold-platforms ( name platforms -- result )
     [ scaffold-platforms ]
-    [
-        drop [ vocab-platforms-path ] keep swap
-        vocab-append-path absolute-path
-    ] 2bi ;
+    [ drop vocab-platforms-path absolute-path ] 2bi ;
 
 : fuel-scaffold-get-root ( name -- result )
     find-vocab-root ;