🎨updates import order

scott-mitchell · Nov 16, 2018 · 004138c · 004138c
1 parent fc2b585
commit 004138c
Show file tree

Hide file tree

Showing 34 changed files with 92 additions and 56 deletions.
diff --git a/auditlog.go b/auditlog.go
@@ -1,12 +1,13 @@
 package disgord
 
 import (
+	"net/http"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
 	"github.com/andersfylling/disgord/ratelimit"
 	"github.com/andersfylling/snowflake/v3"
-	"net/http"
 )
 
 // Audit-log event types

diff --git a/auditlog_test.go b/auditlog_test.go
@@ -2,13 +2,14 @@ package disgord
 
 import (
 	"errors"
+	"io/ioutil"
+	"net/http"
+	"testing"
+
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
 	"github.com/andersfylling/disgord/ratelimit"
 	"github.com/andersfylling/snowflake/v3"
-	"io/ioutil"
-	"net/http"
-	"testing"
 )
 
 func TestAuditLogConvertAuditLogParamsToStr(t *testing.T) {

diff --git a/cache.go b/cache.go
@@ -2,9 +2,10 @@ package disgord
 
 import (
 	"errors"
+	"time"
+
 	"github.com/andersfylling/disgord/httd"
 	"github.com/andersfylling/snowflake/v3"
-	"time"
 
 	"github.com/andersfylling/disgord/cache/interfaces"
 	"github.com/andersfylling/disgord/cache/lfu"

diff --git a/cache/benchmarks_test.go b/cache/benchmarks_test.go
@@ -1,10 +1,11 @@
 package cache
 
 import (
+	"testing"
+
 	"github.com/andersfylling/disgord/cache/interfaces"
 	"github.com/andersfylling/disgord/cache/lfu"
 	"github.com/andersfylling/disgord/cache/lru"
-	"testing"
 )
 
 type Snowflake = interfaces.Snowflake

diff --git a/channel.go b/channel.go
@@ -2,9 +2,10 @@ package disgord
 
 import (
 	"errors"
-	"github.com/andersfylling/disgord/constant"
 	"strconv"
 	"time"
+
+	"github.com/andersfylling/disgord/constant"
 )
 
 // Channel types

diff --git a/channel_test.go b/channel_test.go
@@ -1,9 +1,10 @@
 package disgord
 
 import (
-	"github.com/andersfylling/disgord/httd"
 	"io/ioutil"
 	"testing"
+
+	"github.com/andersfylling/disgord/httd"
 )
 
 func TestChannel_InterfaceImplementations(t *testing.T) {

diff --git a/client.go b/client.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/andersfylling/disgord/constant"
-	"github.com/andersfylling/disgord/websocket"
 	"net/http"
 	"os"
 	"os/signal"
@@ -14,6 +12,9 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/websocket"
+
 	"github.com/andersfylling/disgord/event"
 	"github.com/andersfylling/disgord/httd"
 	"github.com/sirupsen/logrus"

diff --git a/disgord.go b/disgord.go
@@ -138,9 +138,10 @@ package disgord
 
 import (
 	"errors"
+	"strings"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/snowflake/v3"
-	"strings"
 )
 
 // LibraryInfo returns name + version

diff --git a/disgord_test.go b/disgord_test.go
@@ -1,13 +1,14 @@
 package disgord
 
 import (
-	"github.com/andersfylling/disgord/event"
-	"github.com/andersfylling/disgord/websocket"
 	"net/http"
 	"strconv"
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/andersfylling/disgord/event"
+	"github.com/andersfylling/disgord/websocket"
 )
 
 func TestValidateUsername(t *testing.T) {

diff --git a/emoji.go b/emoji.go
@@ -2,13 +2,14 @@ package disgord
 
 import (
 	"errors"
+	"net/http"
+	"strings"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
 	"github.com/andersfylling/disgord/ratelimit"
 	"github.com/andersfylling/snowflake/v3"
-	"net/http"
-	"strings"
 )
 
 // Emoji ...

diff --git a/emoji_test.go b/emoji_test.go
@@ -1,15 +1,16 @@
 package disgord
 
 import (
-	"github.com/andersfylling/disgord/constant"
-	"github.com/andersfylling/disgord/endpoint"
-	"github.com/andersfylling/disgord/httd"
-	"github.com/andersfylling/disgord/ratelimit"
 	"net/http"
 	"os"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/endpoint"
+	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/ratelimit"
 )
 
 func TestEmoji_InterfaceImplementations(t *testing.T) {

diff --git a/httd/json_std.go b/httd/json_std.go
@@ -2,7 +2,10 @@
 
 package httd
 
-import "encoding/json"
+import (
+	"encoding/json"
+	"io"
+)
 
 // Unmarshal is the json unmarshalling implementation that is defined by the used build tags.
 func Unmarshal(data []byte, v interface{}) error {

diff --git a/invite.go b/invite.go
@@ -1,11 +1,12 @@
 package disgord
 
 import (
+	"net/http"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
 	"github.com/andersfylling/disgord/ratelimit"
-	"net/http"
 )
 
 // PartialInvite ...

diff --git a/message.go b/message.go
@@ -4,15 +4,16 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"github.com/andersfylling/disgord/constant"
-	"github.com/andersfylling/disgord/endpoint"
-	"github.com/andersfylling/disgord/httd"
 	"io"
 	"mime/multipart"
 	"net/http"
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/andersfylling/disgord/constant"
+	"github.com/andersfylling/disgord/endpoint"
+	"github.com/andersfylling/disgord/httd"
 )
 
 // different message acticity types

diff --git a/reaction.go b/reaction.go
@@ -2,11 +2,12 @@ package disgord
 
 import (
 	"errors"
+	"net/http"
+	"strconv"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
-	"net/http"
-	"strconv"
 )
 
 // Reaction ...

diff --git a/rest.go b/rest.go
@@ -2,10 +2,11 @@ package disgord
 
 import (
 	"encoding/json"
-	"github.com/andersfylling/disgord/httd"
-	"github.com/andersfylling/snowflake/v3"
 	"net/http"
 	"strconv"
+
+	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/snowflake/v3"
 )
 
 type ErrRest = httd.ErrREST

diff --git a/rest_channel.go b/rest_channel.go
@@ -3,9 +3,10 @@ package disgord
 import (
 	"encoding/json"
 	"errors"
+	"net/http"
+
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
-	"net/http"
 )
 
 func ratelimitChannel(id Snowflake) string {

diff --git a/role.go b/role.go
@@ -2,10 +2,11 @@ package disgord
 
 import (
 	"errors"
+	"net/http"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
-	"net/http"
 )
 
 // NewRole ...

diff --git a/session.go b/session.go
@@ -2,10 +2,11 @@ package disgord
 
 import (
 	"errors"
-	"github.com/andersfylling/disgord/event"
 	"net/http"
 	"time"
 
+	"github.com/andersfylling/disgord/event"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/httd"
 	"github.com/andersfylling/disgord/websocket"

diff --git a/struct.go b/struct.go
@@ -3,10 +3,11 @@ package disgord
 import (
 	"errors"
 	"fmt"
-	"github.com/andersfylling/disgord/constant"
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/andersfylling/disgord/constant"
 )
 
 // common functionality/types used by struct_*.go files goes here

diff --git a/struct_guild.go b/struct_guild.go
@@ -3,8 +3,9 @@ package disgord
 import (
 	"encoding/json"
 	"errors"
-	"github.com/andersfylling/disgord/constant"
 	"sort"
+
+	"github.com/andersfylling/disgord/constant"
 )
 
 // consts inspired by: https://github.com/bwmarrin/discordgo/blob/master/structs.go

diff --git a/struct_guild_test.go b/struct_guild_test.go
@@ -2,9 +2,10 @@ package disgord
 
 import (
 	"encoding/json"
-	"github.com/andersfylling/disgord/httd"
 	"io/ioutil"
 	"testing"
+
+	"github.com/andersfylling/disgord/httd"
 )
 
 func TestGuild_InterfaceImplementations(t *testing.T) {

diff --git a/user.go b/user.go
@@ -3,11 +3,12 @@ package disgord
 import (
 	"encoding/json"
 	"errors"
+	"net/http"
+	"strconv"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
-	"net/http"
-	"strconv"
 )
 
 const (

diff --git a/user_test.go b/user_test.go
@@ -2,9 +2,10 @@ package disgord
 
 import (
 	"fmt"
-	"github.com/andersfylling/disgord/httd"
 	"io/ioutil"
 	"testing"
+
+	"github.com/andersfylling/disgord/httd"
 )
 
 func TestUser_InterfaceImplementations(t *testing.T) {

diff --git a/voice.go b/voice.go
@@ -1,11 +1,12 @@
 package disgord
 
 import (
+	"net/http"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
 	"github.com/andersfylling/disgord/ratelimit"
-	"net/http"
 )
 
 // VoiceState Voice State structure

diff --git a/voice_test.go b/voice_test.go
@@ -1,12 +1,13 @@
 package disgord
 
 import (
-	"github.com/andersfylling/disgord/endpoint"
-	"github.com/andersfylling/disgord/httd"
-	"github.com/andersfylling/disgord/ratelimit"
 	"io/ioutil"
 	"net/http"
 	"testing"
+
+	"github.com/andersfylling/disgord/endpoint"
+	"github.com/andersfylling/disgord/httd"
+	"github.com/andersfylling/disgord/ratelimit"
 )
 
 func TestStateMarshalling(t *testing.T) {

diff --git a/webhook.go b/webhook.go
@@ -2,10 +2,11 @@ package disgord
 
 import (
 	"errors"
+	"net/http"
+
 	"github.com/andersfylling/disgord/constant"
 	"github.com/andersfylling/disgord/endpoint"
 	"github.com/andersfylling/disgord/httd"
-	"net/http"
 )
 
 // Webhook Used to represent a webhook

diff --git a/webhook_test.go b/webhook_test.go
@@ -2,8 +2,9 @@ package disgord
 
 import (
 	"encoding/json"
-	"github.com/andersfylling/disgord/httd"
 	"testing"
+
+	"github.com/andersfylling/disgord/httd"
 )
 
 func getJSONMap(v interface{}) (map[string]*json.RawMessage, error) {