From 19d1ff90037ff273eab84db4a8c164fe69c1b5d1 Mon Sep 17 00:00:00 2001
From: Shelikhoo <xiaokangwang@outlook.com>
Date: Tue, 4 May 2021 11:21:49 +0100
Subject: [PATCH] apply coding style

---
 infra/conf/geodata/memconservative/cache.go       | 5 +++--
 infra/conf/geodata/memconservative/decode.go      | 6 +++---
 infra/conf/geodata/memconservative/decode_test.go | 9 +++++----
 infra/conf/geodata/memconservative/memc.go        | 7 +++----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/infra/conf/geodata/memconservative/cache.go b/infra/conf/geodata/memconservative/cache.go
index 88b61a432..e62ecd074 100644
--- a/infra/conf/geodata/memconservative/cache.go
+++ b/infra/conf/geodata/memconservative/cache.go
@@ -1,11 +1,12 @@
 package memconservative
 
 import (
+	"io/ioutil"
+	"strings"
+
 	"github.com/golang/protobuf/proto"
 	"github.com/v2fly/v2ray-core/v4/app/router"
 	"github.com/v2fly/v2ray-core/v4/common/platform"
-	"io/ioutil"
-	"strings"
 )
 
 type GeoIPCache map[string]*router.GeoIP
diff --git a/infra/conf/geodata/memconservative/decode.go b/infra/conf/geodata/memconservative/decode.go
index 30eab0149..33ab1d41a 100644
--- a/infra/conf/geodata/memconservative/decode.go
+++ b/infra/conf/geodata/memconservative/decode.go
@@ -2,10 +2,11 @@ package memconservative
 
 import (
 	"errors"
-	"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
-	"google.golang.org/protobuf/encoding/protowire"
 	"io"
 	"strings"
+
+	"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
+	"google.golang.org/protobuf/encoding/protowire"
 )
 
 var (
@@ -84,7 +85,6 @@ Loop:
 			result = container
 			break Loop
 		}
-
 	}
 	return result, nil
 }
diff --git a/infra/conf/geodata/memconservative/decode_test.go b/infra/conf/geodata/memconservative/decode_test.go
index 9b446ee77..fda5b7ce5 100644
--- a/infra/conf/geodata/memconservative/decode_test.go
+++ b/infra/conf/geodata/memconservative/decode_test.go
@@ -2,14 +2,15 @@ package memconservative
 
 import (
 	"errors"
-	"github.com/google/go-cmp/cmp"
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/platform"
-	"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/v2fly/v2ray-core/v4/common"
+	"github.com/v2fly/v2ray-core/v4/common/platform"
+	"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
 )
 
 const (
diff --git a/infra/conf/geodata/memconservative/memc.go b/infra/conf/geodata/memconservative/memc.go
index 2961f1248..1ee7c6f0e 100644
--- a/infra/conf/geodata/memconservative/memc.go
+++ b/infra/conf/geodata/memconservative/memc.go
@@ -1,9 +1,10 @@
 package memconservative
 
 import (
+	"runtime"
+
 	"github.com/v2fly/v2ray-core/v4/app/router"
 	"github.com/v2fly/v2ray-core/v4/infra/conf/geodata"
-	"runtime"
 )
 
 //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
@@ -36,7 +37,5 @@ func newMemConservativeLoader() geodata.LoaderImplementation {
 }
 
 func init() {
-	geodata.RegisterGeoDataLoaderImplementationCreator("memconservative", func() geodata.LoaderImplementation {
-		return newMemConservativeLoader()
-	})
+	geodata.RegisterGeoDataLoaderImplementationCreator("memconservative", newMemConservativeLoader)
 }