Fix some imports

4 files changed, 41 insertions, 41 deletions

diff --git a/forged/.golangci.yaml b/forged/.golangci.yaml
index 7bd6ec1..e475c41 100644
--- a/forged/.golangci.yaml
+++ b/forged/.golangci.yaml
@@ -2,41 +2,41 @@ version: "2"
 
 linters:
   default: all
-#  disable:
-#    - depguard
-#    - err113           # dynamically defined errors are fine for our purposes
-#    - forcetypeassert  # type assertion failures are usually programming errors
-#    - gochecknoinits   # we use inits sparingly for good reasons
-#    - godox            # they're just used as markers for where needs improvements
-#    - ireturn          # doesn't work well with how we use generics
-#    - lll              # long lines are acceptable
-#    - mnd              # it's a bit ridiculous to replace all of them
-#    - nakedret         # patterns should be consistent
-#    - nonamedreturns   # i like named returns
-#    - wrapcheck        # wrapping all errors is just not necessary
-#    - varnamelen       # "from" and "to" are very valid
-#    - containedctx
-#    - godot
-#    - dogsled
-#    - maintidx    # e
-#    - nestif      # e
-#    - gocognit    # e
-#    - gocyclo     # e
-#    - dupl        # e
-#    - cyclop      # e
-#    - goconst     # e
-#    - funlen      # e
-#    - wsl         # e
-#    - nlreturn    # e
-#    - unused      # e
-#    - exhaustruct # e
-# 
-# linters-settings:
-#   revive:
-#     rules:
-#       - name: error-strings
-#         disabled: true
-# 
-# issues:
-#   max-issues-per-linter: 0
-#   max-same-issues: 0
+  disable:
+    - depguard
+    - err113           # dynamically defined errors are fine for our purposes
+    - forcetypeassert  # type assertion failures are usually programming errors
+    - gochecknoinits   # we use inits sparingly for good reasons
+    - godox            # they're just used as markers for where needs improvements
+    - ireturn          # doesn't work well with how we use generics
+    - lll              # long lines are acceptable
+    - mnd              # it's a bit ridiculous to replace all of them
+    - nakedret         # patterns should be consistent
+    - nonamedreturns   # i like named returns
+    - wrapcheck        # wrapping all errors is just not necessary
+    - varnamelen       # "from" and "to" are very valid
+    - containedctx
+    - godot
+    - dogsled
+    - maintidx    # e
+    - nestif      # e
+    - gocognit    # e
+    - gocyclo     # e
+    - dupl        # e
+    - cyclop      # e
+    - goconst     # e
+    - funlen      # e
+    - wsl         # e
+    - nlreturn    # e
+    - unused      # e
+    - exhaustruct # e
+
+linters-settings:
+  revive:
+    rules:
+      - name: error-strings
+        disabled: true
+
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
diff --git a/forged/internal/common/bare/reader.go b/forged/internal/common/bare/reader.go
index 58325e3..028a7aa 100644
--- a/forged/internal/common/bare/reader.go
+++ b/forged/internal/common/bare/reader.go
@@ -10,7 +10,7 @@ import (
 	"math"
 	"unicode/utf8"
 
-	"go.lindenii.runxiyu.org/forge/forged/internal/misc"
+	"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
 )
 
 type byteReader interface {
diff --git a/forged/internal/common/bare/writer.go b/forged/internal/common/bare/writer.go
index bada045..80cd7e2 100644
--- a/forged/internal/common/bare/writer.go
+++ b/forged/internal/common/bare/writer.go
@@ -9,7 +9,7 @@ import (
 	"io"
 	"math"
 
-	"go.lindenii.runxiyu.org/forge/forged/internal/misc"
+	"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
 )
 
 // A Writer for BARE primitive types.
diff --git a/forged/internal/ipc/git2c/client.go b/forged/internal/ipc/git2c/client.go
index d8dc2ea..9f1b55c 100644
--- a/forged/internal/ipc/git2c/client.go
+++ b/forged/internal/ipc/git2c/client.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"net"
 
-	"go.lindenii.runxiyu.org/forge/forged/internal/bare"
+	"go.lindenii.runxiyu.org/forge/forged/internal/common/bare"
 )
 
 // Client represents a connection to the git2d backend daemon.