From df1356848b3e159236bbf36dac2db9b42e4121b9 Mon Sep 17 00:00:00 2001
From: Edward Langley <el-github@elangley.org>
Date: Wed, 8 Nov 2023 04:33:15 -0800
Subject: [PATCH] chore: fewer :: again

---
 delta.lisp             |  4 ++--
 model.lisp             |  2 +-
 package.lisp           | 15 +++++----------
 tests/git-objects.lisp |  2 +-
 util.lisp              |  5 +++--
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/delta.lisp b/delta.lisp
index b2f4279..55f3ccc 100644
--- a/delta.lisp
+++ b/delta.lisp
@@ -9,10 +9,10 @@
   (:documentation
    "The base type for deltified git objects"))
 
-(fwoar.cl-git::defclass+ ofs-delta (delta)
+(fwoar.cl-git.utils:defclass+ ofs-delta (delta)
   ())
 
-(fwoar.cl-git::defclass+ ref-delta (delta)
+(fwoar.cl-git.utils:defclass+ ref-delta (delta)
   ()
   (:documentation "TODO: mostly unimplemented/untested"))
 
diff --git a/model.lisp b/model.lisp
index c82b12e..8851e28 100644
--- a/model.lisp
+++ b/model.lisp
@@ -125,7 +125,7 @@
 (defmethod component ((component (eql :hash)) (object git-object))
   (hash object))
 
-(fw.lu:defclass+ blob (fwoar.cl-git::git-object)
+(fwoar.cl-git.utils:defclass+ blob (fwoar.cl-git::git-object)
   ((%data :reader data :initarg :data)))
 (defmethod -extract-object-of-type ((type (eql :blob)) s repository &key)
   (blob s))
diff --git a/package.lisp b/package.lisp
index 0e8124a..630dea7 100644
--- a/package.lisp
+++ b/package.lisp
@@ -21,25 +21,20 @@
   (:export #:pack #:pack-file #:index-file #:idx-toc
            #:with-pack-streams #:seek-to-object-in-pack #:packed-ref
            #:packed-ref-pack #:packed-ref-offset #:extract-object #:git-ref
-           #:loose-ref
-           #:extract-object-at-pos))
+           #:loose-ref #:extract-object-at-pos #:raw-object-for-ref))
 
 (defpackage :fwoar.cl-git.ref
   (:use :cl :fwoar.cl-git.protocol)
-  (:export #:git-ref #:loose-ref
-           #:ref-repo
-           #:ref-hash
-           #:loose-ref-file))
+  (:export #:git-ref #:loose-ref #:ref-repo #:ref-hash #:loose-ref-file))
 
 (defpackage :fwoar.cl-git
   (:use :cl :fwoar.cl-git.protocol)
   (:import-from :fwoar.cl-git.commit #:git-commit)
   (:import-from :fwoar.cl-git.pack #:packed-ref)
   (:import-from :fwoar.cl-git.ref #:git-ref #:loose-ref #:ref-hash #:ref-repo)
-  (:export #:ensure-ref #:repository #:*want-delta* #:git-object
-           #:hash #:*git-encoding* #:git-commit #:ref #:component
-           #:*git-repository* #:git-ref #:extract-object #:git-tree
-           #:blob))
+  (:export #:ensure-ref #:repository #:*want-delta* #:git-object #:hash
+           #:*git-encoding* #:git-commit #:ref #:component #:*git-repository*
+           #:git-ref #:extract-object #:git-tree #:blob))
 
 (defpackage :fwoar.cl-git.types
   (:use :cl )
diff --git a/tests/git-objects.lisp b/tests/git-objects.lisp
index e020a21..8a5a6c7 100644
--- a/tests/git-objects.lisp
+++ b/tests/git-objects.lisp
@@ -272,7 +272,7 @@
                 "cab7cafae3b61c5b101ee914cd4f5c8357e77fad"
                 "f03a8d1b4cea085ee9555037d09bca2dbfb990cb")))
     (loop for commit in shas
-          for obj = (fwoar.cl-git.pack::raw-object-for-ref
+          for obj = (fwoar.cl-git.pack:raw-object-for-ref
                      (fwoar.cl-git:ref :fwoar.cl-git.git-objects.pack-2 commit))
           do (5am:is (equal (crypto:byte-array-to-hex-string
                              (crypto:digest-sequence :sha1 obj))
diff --git a/util.lisp b/util.lisp
index f1bd045..5374d96 100644
--- a/util.lisp
+++ b/util.lisp
@@ -96,5 +96,6 @@
 
 (defpackage :fwoar.cl-git.utils
   (:use :cl)
-  (:import-from :fwoar.cl-git #:partition-subseq #:sym->plist #:read-bytes)
-  (:export #:partition-subseq #:sym->plist #:read-bytes))
+  (:import-from :fwoar.cl-git #:partition-subseq #:sym->plist #:read-bytes
+                #:defclass+)
+  (:export #:partition-subseq #:sym->plist #:read-bytes #:defclass+))