Move packages out of dirs

Fixes #2
2019-09-15 17:43:09 +02:00 · 2019-09-15 17:43:09 +02:00 · b7a4b1fee8
commit b7a4b1fee8
parent 66bbac8a8a
5 changed files with 8 additions and 8 deletions
--- a/cmd/rushlink/main.go
+++ b/cmd/rushlink/main.go
@ -9,9 +9,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"

-	"gitea.hashru.nl/dsprenkels/rushlink/internal/db"
-	"gitea.hashru.nl/dsprenkels/rushlink/internal/handlers"
-	"gitea.hashru.nl/dsprenkels/rushlink/internal/metrics"
+	"gitea.hashru.nl/dsprenkels/rushlink/db"
+	"gitea.hashru.nl/dsprenkels/rushlink/handlers"
+	"gitea.hashru.nl/dsprenkels/rushlink/metrics"
 )

 type ParsedArguments struct {
--- a/internal/db/db.go
+++ b/internal/db/db.go
@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"

-	"gitea.hashru.nl/dsprenkels/rushlink/pkg/gobmarsh"
+	"gitea.hashru.nl/dsprenkels/rushlink/gobmarsh"
 )

 var DB *bolt.DB
--- a/pkg/gobmarsh/marshal.go
+++ b/pkg/gobmarsh/marshal.go
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@ -2,7 +2,7 @@ package handlers

 //go:generate go get github.com/go-bindata/go-bindata
 //go:generate go get -u github.com/go-bindata/go-bindata/...
-//go:generate go-bindata -pkg $GOPACKAGE -prefix ../../assets ../../assets/...
+//go:generate go-bindata -pkg $GOPACKAGE -prefix ../assets ../assets/...

 import (
 	"bytes"
@ -23,8 +23,8 @@ import (
 	"github.com/pkg/errors"
 	bolt "go.etcd.io/bbolt"

-	"gitea.hashru.nl/dsprenkels/rushlink/internal/db"
-	"gitea.hashru.nl/dsprenkels/rushlink/pkg/gobmarsh"
+	"gitea.hashru.nl/dsprenkels/rushlink/db"
+	"gitea.hashru.nl/dsprenkels/rushlink/gobmarsh"
 )

 type PasteType int
--- a/internal/metrics/metrics.go
+++ b/internal/metrics/metrics.go
@ -12,7 +12,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	bolt "go.etcd.io/bbolt"

-	"gitea.hashru.nl/dsprenkels/rushlink/internal/db"
+	"gitea.hashru.nl/dsprenkels/rushlink/db"
 )

 const (