Global round of go-fmt

cmaglie · cmaglie · commit 290f10caeb74 · 2019-06-04T15:28:04.000+02:00
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -26,14 +26,14 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/arduino/arduino-cli/legacy/builder"
-	"github.com/arduino/arduino-cli/legacy/builder/i18n"
-	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketches"
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/arduino/arduino-cli/commands"
+	"github.com/arduino/arduino-cli/legacy/builder"
+	"github.com/arduino/arduino-cli/legacy/builder/i18n"
+	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/rpc"
 	paths "github.com/arduino/go-paths-helper"
 	properties "github.com/arduino/go-properties-orderedmap"
diff --git a/legacy/builder/add_additional_entries_to_context.go b/legacy/builder/add_additional_entries_to_context.go
@@ -30,10 +30,10 @@
 package builder
 
 import (
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/cores"
 )
 
 type AddAdditionalEntriesToContext struct{}
diff --git a/legacy/builder/client/client.go b/legacy/builder/client/client.go
@@ -70,16 +70,16 @@ func main() {
 	exampleParames := pb.BuildParams{
 		BuiltInLibrariesFolders: "/ssd/Arduino-master/build/linux/work/libraries",
 		CustomBuildProperties:   "build.warn_data_percentage=75",
-		FQBN:                  "arduino:avr:mega:cpu=atmega2560",
-		HardwareFolders:       "/ssd/Arduino-master/build/linux/work/hardware,/home/martino/.arduino15/packages,/home/martino/eslov-sk/hardware",
-		OtherLibrariesFolders: "/home/martino/eslov-sk/libraries",
-		ArduinoAPIVersion:     "10805",
-		SketchLocation:        "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino",
-		ToolsFolders:          "/ssd/Arduino-master/build/linux/work/tools-builder,/ssd/Arduino-master/build/linux/work/hardware/tools/avr,/home/martino/.arduino15/packages",
-		Verbose:               true,
-		WarningsLevel:         "all",
-		BuildCachePath:        "/tmp/arduino_cache_761418/",
-		CodeCompleteAt:        "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino:56:9",
+		FQBN:                    "arduino:avr:mega:cpu=atmega2560",
+		HardwareFolders:         "/ssd/Arduino-master/build/linux/work/hardware,/home/martino/.arduino15/packages,/home/martino/eslov-sk/hardware",
+		OtherLibrariesFolders:   "/home/martino/eslov-sk/libraries",
+		ArduinoAPIVersion:       "10805",
+		SketchLocation:          "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino",
+		ToolsFolders:            "/ssd/Arduino-master/build/linux/work/tools-builder,/ssd/Arduino-master/build/linux/work/hardware/tools/avr,/home/martino/.arduino15/packages",
+		Verbose:                 true,
+		WarningsLevel:           "all",
+		BuildCachePath:          "/tmp/arduino_cache_761418/",
+		CodeCompleteAt:          "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino:56:9",
 	}
 
 	//build(client, &exampleParames)
diff --git a/legacy/builder/container_find_includes.go b/legacy/builder/container_find_includes.go
@@ -112,12 +112,12 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder/builder_utils"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
-	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/go-paths-helper"
 
 	"github.com/go-errors/errors"
diff --git a/legacy/builder/fail_if_imported_library_is_wrong.go b/legacy/builder/fail_if_imported_library_is_wrong.go
@@ -30,10 +30,10 @@
 package builder
 
 import (
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/libraries"
 )
 
 type FailIfImportedLibraryIsWrong struct{}
diff --git a/legacy/builder/hardware_loader.go b/legacy/builder/hardware_loader.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
+	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 )
 
 type HardwareLoader struct{}
diff --git a/legacy/builder/i18n/errors.go b/legacy/builder/i18n/errors.go
@@ -23,9 +23,9 @@ func UnwrapError(err error) error {
 	// Perhaps go-errors can do this already in later versions?
 	// See https://github.com/go-errors/errors/issues/14
 	switch e := err.(type) {
-		case *errors.Error:
-			return e.Err
-		default:
-			return err
+	case *errors.Error:
+		return e.Err
+	default:
+		return err
 	}
 }
diff --git a/legacy/builder/libraries_loader.go b/legacy/builder/libraries_loader.go
@@ -32,11 +32,11 @@ package builder
 import (
 	"os"
 
-	"github.com/arduino/arduino-cli/legacy/builder/i18n"
-	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesresolver"
+	"github.com/arduino/arduino-cli/legacy/builder/i18n"
+	"github.com/arduino/arduino-cli/legacy/builder/types"
 )
 
 type LibrariesLoader struct{}
diff --git a/legacy/builder/phases/libraries_builder.go b/legacy/builder/phases/libraries_builder.go
@@ -33,12 +33,12 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder/builder_utils"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
-	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-orderedmap"
 )
diff --git a/legacy/builder/resolve_library.go b/legacy/builder/resolve_library.go
@@ -32,9 +32,9 @@ package builder
 import (
 	"fmt"
 
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/libraries"
 )
 
 func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {
diff --git a/legacy/builder/rewrite_hardware_keys.go b/legacy/builder/rewrite_hardware_keys.go
@@ -30,9 +30,9 @@
 package builder
 
 import (
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/cores"
 )
 
 type RewriteHardwareKeys struct{}
diff --git a/legacy/builder/setup_build_properties.go b/legacy/builder/setup_build_properties.go
@@ -36,9 +36,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
-	"github.com/arduino/arduino-cli/arduino/cores"
 	properties "github.com/arduino/go-properties-orderedmap"
 	timeutils "github.com/arduino/go-timeutils"
 )
diff --git a/legacy/builder/test/add_build_board_property_if_missing_test.go b/legacy/builder/test/add_build_board_property_if_missing_test.go
@@ -33,9 +33,9 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 )
diff --git a/legacy/builder/test/helper.go b/legacy/builder/test/helper.go
@@ -37,10 +37,10 @@ import (
 	"testing"
 	"text/template"
 
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
-	"github.com/arduino/arduino-cli/arduino/libraries"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/go-errors/errors"
 	"github.com/stretchr/testify/assert"
diff --git a/legacy/builder/test/libraries_loader_test.go b/legacy/builder/test/libraries_loader_test.go
@@ -34,10 +34,10 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/libraries"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 )
diff --git a/legacy/builder/test/rewrite_hardware_keys_test.go b/legacy/builder/test/rewrite_hardware_keys_test.go
@@ -32,9 +32,9 @@ package test
 import (
 	"testing"
 
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/cores"
 	properties "github.com/arduino/go-properties-orderedmap"
 	"github.com/stretchr/testify/require"
 )
diff --git a/legacy/builder/test/tools_loader_test.go b/legacy/builder/test/tools_loader_test.go
@@ -33,9 +33,9 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/cores"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 )
diff --git a/legacy/builder/test/unused_compiled_libraries_remover_test.go b/legacy/builder/test/unused_compiled_libraries_remover_test.go
@@ -32,9 +32,9 @@ package test
 import (
 	"testing"
 
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/libraries"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 )
diff --git a/legacy/builder/test/utils_test.go b/legacy/builder/test/utils_test.go
@@ -109,8 +109,8 @@ func TestMapTrimSpace(t *testing.T) {
 
 func TestQuoteCppString(t *testing.T) {
 	cases := map[string]string{
-		`foo`:     `"foo"`,
-		`foo\bar`: `"foo\\bar"`,
+		`foo`:                                  `"foo"`,
+		`foo\bar`:                              `"foo\\bar"`,
 		`foo "is" quoted and \\bar"" escaped\`: `"foo \"is\" quoted and \\\\bar\"\" escaped\\"`,
 		// ASCII 0x20 - 0x7e, excluding `
 		` !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_abcdefghijklmnopqrstuvwxyz{|}~`: `" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijklmnopqrstuvwxyz{|}~"`,
diff --git a/legacy/builder/types/context.go b/legacy/builder/types/context.go
@@ -4,12 +4,12 @@ import (
 	"io"
 	"strings"
 
-	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesresolver"
+	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	paths "github.com/arduino/go-paths-helper"
 	properties "github.com/arduino/go-properties-orderedmap"
 )
diff --git a/legacy/builder/unused_compiled_libraries_remover.go b/legacy/builder/unused_compiled_libraries_remover.go
@@ -30,10 +30,10 @@
 package builder
 
 import (
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder/i18n"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/arduino-cli/legacy/builder/utils"
-	"github.com/arduino/arduino-cli/arduino/libraries"
 )
 
 type UnusedCompiledLibrariesRemover struct{}
diff --git a/legacy/builder/warn_about_platform_rewrites.go b/legacy/builder/warn_about_platform_rewrites.go
@@ -32,9 +32,9 @@ package builder
 import (
 	"os"
 
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
-	"github.com/arduino/arduino-cli/arduino/cores"
 )
 
 type WarnAboutPlatformRewrites struct{}

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@`
`30`	`30`	`package builder`
`31`	`31`
`32`	`32`	`import (`
	`33`	`+ "github.com/arduino/arduino-cli/arduino/cores/packagemanager"`
`33`	`34`	`"github.com/arduino/arduino-cli/legacy/builder/i18n"`
`34`	`35`	`"github.com/arduino/arduino-cli/legacy/builder/types"`
`35`		`- "github.com/arduino/arduino-cli/arduino/cores/packagemanager"`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`type HardwareLoader struct{}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ func UnwrapError(err error) error {`
`23`	`23`	`// Perhaps go-errors can do this already in later versions?`
`24`	`24`	`// See https://github.com/go-errors/errors/issues/14`
`25`	`25`	`switch e := err.(type) {`
`26`		`- case *errors.Error:`
`27`		`- return e.Err`
`28`		`- default:`
`29`		`- return err`
	`26`	`+ case *errors.Error:`
	`27`	`+ return e.Err`
	`28`	`+ default:`
	`29`	`+ return err`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ package builder`
`32`	`32`	`import (`
`33`	`33`	`"fmt"`
`34`	`34`
	`35`	`+ "github.com/arduino/arduino-cli/arduino/libraries"`
`35`	`36`	`"github.com/arduino/arduino-cli/legacy/builder/constants"`
`36`	`37`	`"github.com/arduino/arduino-cli/legacy/builder/types"`
`37`		`- "github.com/arduino/arduino-cli/arduino/libraries"`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`func ResolveLibrary(ctx types.Context, header string) libraries.Library {`