Skip to content

Commit c428dc3

Browse files
cmagliecmaglie
committed
Global round of go-fmt
1 parent 5b724c6 commit c428dc3

22 files changed

+38
-38
lines changed

‎commands/compile/compile.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ import (
2626
"sort"
2727
"strings"
2828

29-
"github.com/arduino/arduino-cli/legacy/builder"
30-
"github.com/arduino/arduino-cli/legacy/builder/i18n"
31-
"github.com/arduino/arduino-cli/legacy/builder/types"
3229
"github.com/arduino/arduino-cli/arduino/cores"
3330
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
3431
"github.com/arduino/arduino-cli/arduino/sketches"
3532
"github.com/arduino/arduino-cli/cli"
3633
"github.com/arduino/arduino-cli/commands"
34+
"github.com/arduino/arduino-cli/legacy/builder"
35+
"github.com/arduino/arduino-cli/legacy/builder/i18n"
36+
"github.com/arduino/arduino-cli/legacy/builder/types"
3737
"github.com/arduino/arduino-cli/rpc"
3838
paths "github.com/arduino/go-paths-helper"
3939
properties "github.com/arduino/go-properties-orderedmap"

‎legacy/builder/add_additional_entries_to_context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder
3131

3232
import (
33+
"github.com/arduino/arduino-cli/arduino/cores"
3334
"github.com/arduino/arduino-cli/legacy/builder/constants"
3435
"github.com/arduino/arduino-cli/legacy/builder/i18n"
3536
"github.com/arduino/arduino-cli/legacy/builder/types"
36-
"github.com/arduino/arduino-cli/arduino/cores"
3737
)
3838

3939
type AddAdditionalEntriesToContext struct{}

‎legacy/builder/client/client.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ func main() {
7070
exampleParames := pb.BuildParams{
7171
BuiltInLibrariesFolders: "/ssd/Arduino-master/build/linux/work/libraries",
7272
CustomBuildProperties: "build.warn_data_percentage=75",
73-
FQBN: "arduino:avr:mega:cpu=atmega2560",
74-
HardwareFolders: "/ssd/Arduino-master/build/linux/work/hardware,/home/martino/.arduino15/packages,/home/martino/eslov-sk/hardware",
75-
OtherLibrariesFolders: "/home/martino/eslov-sk/libraries",
76-
ArduinoAPIVersion: "10805",
77-
SketchLocation: "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino",
78-
ToolsFolders: "/ssd/Arduino-master/build/linux/work/tools-builder,/ssd/Arduino-master/build/linux/work/hardware/tools/avr,/home/martino/.arduino15/packages",
79-
Verbose: true,
80-
WarningsLevel: "all",
81-
BuildCachePath: "/tmp/arduino_cache_761418/",
82-
CodeCompleteAt: "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino:56:9",
73+
FQBN: "arduino:avr:mega:cpu=atmega2560",
74+
HardwareFolders: "/ssd/Arduino-master/build/linux/work/hardware,/home/martino/.arduino15/packages,/home/martino/eslov-sk/hardware",
75+
OtherLibrariesFolders: "/home/martino/eslov-sk/libraries",
76+
ArduinoAPIVersion: "10805",
77+
SketchLocation: "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino",
78+
ToolsFolders: "/ssd/Arduino-master/build/linux/work/tools-builder,/ssd/Arduino-master/build/linux/work/hardware/tools/avr,/home/martino/.arduino15/packages",
79+
Verbose: true,
80+
WarningsLevel: "all",
81+
BuildCachePath: "/tmp/arduino_cache_761418/",
82+
CodeCompleteAt: "/home/martino/eslov-sk/libraries/WiFi101/examples/ScanNetworks/ScanNetworks.ino:56:9",
8383
}
8484

8585
//build(client, &exampleParames)

‎legacy/builder/container_find_includes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ import (
112112
"os/exec"
113113
"time"
114114

115+
"github.com/arduino/arduino-cli/arduino/libraries"
115116
"github.com/arduino/arduino-cli/legacy/builder/builder_utils"
116117
"github.com/arduino/arduino-cli/legacy/builder/constants"
117118
"github.com/arduino/arduino-cli/legacy/builder/i18n"
118119
"github.com/arduino/arduino-cli/legacy/builder/types"
119120
"github.com/arduino/arduino-cli/legacy/builder/utils"
120-
"github.com/arduino/arduino-cli/arduino/libraries"
121121
"github.com/arduino/go-paths-helper"
122122

123123
"github.com/go-errors/errors"

‎legacy/builder/fail_if_imported_library_is_wrong.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder
3131

3232
import (
33+
"github.com/arduino/arduino-cli/arduino/libraries"
3334
"github.com/arduino/arduino-cli/legacy/builder/constants"
3435
"github.com/arduino/arduino-cli/legacy/builder/i18n"
3536
"github.com/arduino/arduino-cli/legacy/builder/types"
36-
"github.com/arduino/arduino-cli/arduino/libraries"
3737
)
3838

3939
type FailIfImportedLibraryIsWrong struct{}

‎legacy/builder/hardware_loader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
3334
"github.com/arduino/arduino-cli/legacy/builder/i18n"
3435
"github.com/arduino/arduino-cli/legacy/builder/types"
35-
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
3636
)
3737

3838
type HardwareLoader struct{}

‎legacy/builder/i18n/errors.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ func UnwrapError(err error) error {
2323
// Perhaps go-errors can do this already in later versions?
2424
// See https://github.com/go-errors/errors/issues/14
2525
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
3030
}
3131
}

‎legacy/builder/libraries_loader.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ package builder
3232
import (
3333
"os"
3434

35-
"github.com/arduino/arduino-cli/legacy/builder/i18n"
36-
"github.com/arduino/arduino-cli/legacy/builder/types"
3735
"github.com/arduino/arduino-cli/arduino/libraries"
3836
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
3937
"github.com/arduino/arduino-cli/arduino/libraries/librariesresolver"
38+
"github.com/arduino/arduino-cli/legacy/builder/i18n"
39+
"github.com/arduino/arduino-cli/legacy/builder/types"
4040
)
4141

4242
type LibrariesLoader struct{}

‎legacy/builder/phases/libraries_builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import (
3333
"path/filepath"
3434
"strings"
3535

36+
"github.com/arduino/arduino-cli/arduino/libraries"
3637
"github.com/arduino/arduino-cli/legacy/builder/builder_utils"
3738
"github.com/arduino/arduino-cli/legacy/builder/constants"
3839
"github.com/arduino/arduino-cli/legacy/builder/i18n"
3940
"github.com/arduino/arduino-cli/legacy/builder/types"
4041
"github.com/arduino/arduino-cli/legacy/builder/utils"
41-
"github.com/arduino/arduino-cli/arduino/libraries"
4242
"github.com/arduino/go-paths-helper"
4343
"github.com/arduino/go-properties-orderedmap"
4444
)

‎legacy/builder/resolve_library.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ package builder
3232
import (
3333
"fmt"
3434

35+
"github.com/arduino/arduino-cli/arduino/libraries"
3536
"github.com/arduino/arduino-cli/legacy/builder/constants"
3637
"github.com/arduino/arduino-cli/legacy/builder/types"
37-
"github.com/arduino/arduino-cli/arduino/libraries"
3838
)
3939

4040
func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {

‎legacy/builder/rewrite_hardware_keys.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
package builder
3131

3232
import (
33+
"github.com/arduino/arduino-cli/arduino/cores"
3334
"github.com/arduino/arduino-cli/legacy/builder/constants"
3435
"github.com/arduino/arduino-cli/legacy/builder/types"
35-
"github.com/arduino/arduino-cli/arduino/cores"
3636
)
3737

3838
type RewriteHardwareKeys struct{}

‎legacy/builder/setup_build_properties.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import (
3636
"strings"
3737
"time"
3838

39+
"github.com/arduino/arduino-cli/arduino/cores"
3940
"github.com/arduino/arduino-cli/legacy/builder/types"
4041
"github.com/arduino/arduino-cli/legacy/builder/utils"
41-
"github.com/arduino/arduino-cli/arduino/cores"
4242
properties "github.com/arduino/go-properties-orderedmap"
4343
timeutils "github.com/arduino/go-timeutils"
4444
)

‎legacy/builder/test/add_build_board_property_if_missing_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"path/filepath"
3434
"testing"
3535

36+
"github.com/arduino/arduino-cli/arduino/cores"
3637
"github.com/arduino/arduino-cli/legacy/builder"
3738
"github.com/arduino/arduino-cli/legacy/builder/types"
38-
"github.com/arduino/arduino-cli/arduino/cores"
3939
"github.com/arduino/go-paths-helper"
4040
"github.com/stretchr/testify/require"
4141
)

‎legacy/builder/test/helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ import (
3737
"testing"
3838
"text/template"
3939

40+
"github.com/arduino/arduino-cli/arduino/libraries"
4041
"github.com/arduino/arduino-cli/legacy/builder/constants"
4142
"github.com/arduino/arduino-cli/legacy/builder/types"
4243
"github.com/arduino/arduino-cli/legacy/builder/utils"
43-
"github.com/arduino/arduino-cli/arduino/libraries"
4444
paths "github.com/arduino/go-paths-helper"
4545
"github.com/go-errors/errors"
4646
"github.com/stretchr/testify/assert"

‎legacy/builder/test/libraries_loader_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import (
3434
"sort"
3535
"testing"
3636

37+
"github.com/arduino/arduino-cli/arduino/libraries"
3738
"github.com/arduino/arduino-cli/legacy/builder"
3839
"github.com/arduino/arduino-cli/legacy/builder/constants"
3940
"github.com/arduino/arduino-cli/legacy/builder/types"
40-
"github.com/arduino/arduino-cli/arduino/libraries"
4141
paths "github.com/arduino/go-paths-helper"
4242
"github.com/stretchr/testify/require"
4343
)

‎legacy/builder/test/rewrite_hardware_keys_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ package test
3232
import (
3333
"testing"
3434

35+
"github.com/arduino/arduino-cli/arduino/cores"
3536
"github.com/arduino/arduino-cli/legacy/builder"
3637
"github.com/arduino/arduino-cli/legacy/builder/types"
37-
"github.com/arduino/arduino-cli/arduino/cores"
3838
properties "github.com/arduino/go-properties-orderedmap"
3939
"github.com/stretchr/testify/require"
4040
)

‎legacy/builder/test/tools_loader_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"sort"
3434
"testing"
3535

36+
"github.com/arduino/arduino-cli/arduino/cores"
3637
"github.com/arduino/arduino-cli/legacy/builder"
3738
"github.com/arduino/arduino-cli/legacy/builder/types"
38-
"github.com/arduino/arduino-cli/arduino/cores"
3939
paths "github.com/arduino/go-paths-helper"
4040
"github.com/stretchr/testify/require"
4141
)

‎legacy/builder/test/unused_compiled_libraries_remover_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ package test
3232
import (
3333
"testing"
3434

35+
"github.com/arduino/arduino-cli/arduino/libraries"
3536
"github.com/arduino/arduino-cli/legacy/builder"
3637
"github.com/arduino/arduino-cli/legacy/builder/types"
37-
"github.com/arduino/arduino-cli/arduino/libraries"
3838
paths "github.com/arduino/go-paths-helper"
3939
"github.com/stretchr/testify/require"
4040
)

‎legacy/builder/test/utils_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ func TestMapTrimSpace(t *testing.T) {
109109

110110
func TestQuoteCppString(t *testing.T) {
111111
cases := map[string]string{
112-
`foo`: `"foo"`,
113-
`foo\bar`: `"foo\\bar"`,
112+
`foo`: `"foo"`,
113+
`foo\bar`: `"foo\\bar"`,
114114
`foo "is" quoted and \\bar"" escaped\`: `"foo \"is\" quoted and \\\\bar\"\" escaped\\"`,
115115
// ASCII 0x20 - 0x7e, excluding `
116116
` !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_abcdefghijklmnopqrstuvwxyz{|}~`: `" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijklmnopqrstuvwxyz{|}~"`,

‎legacy/builder/types/context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"io"
55
"strings"
66

7-
"github.com/arduino/arduino-cli/legacy/builder/i18n"
87
"github.com/arduino/arduino-cli/arduino/cores"
98
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
109
"github.com/arduino/arduino-cli/arduino/libraries"
1110
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
1211
"github.com/arduino/arduino-cli/arduino/libraries/librariesresolver"
12+
"github.com/arduino/arduino-cli/legacy/builder/i18n"
1313
paths "github.com/arduino/go-paths-helper"
1414
properties "github.com/arduino/go-properties-orderedmap"
1515
)

‎legacy/builder/unused_compiled_libraries_remover.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
package builder
3131

3232
import (
33+
"github.com/arduino/arduino-cli/arduino/libraries"
3334
"github.com/arduino/arduino-cli/legacy/builder/i18n"
3435
"github.com/arduino/arduino-cli/legacy/builder/types"
3536
"github.com/arduino/arduino-cli/legacy/builder/utils"
36-
"github.com/arduino/arduino-cli/arduino/libraries"
3737
)
3838

3939
type UnusedCompiledLibrariesRemover struct{}

‎legacy/builder/warn_about_platform_rewrites.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ package builder
3232
import (
3333
"os"
3434

35+
"github.com/arduino/arduino-cli/arduino/cores"
3536
"github.com/arduino/arduino-cli/legacy/builder/constants"
3637
"github.com/arduino/arduino-cli/legacy/builder/types"
37-
"github.com/arduino/arduino-cli/arduino/cores"
3838
)
3939

4040
type WarnAboutPlatformRewrites struct{}

0 commit comments

Comments
 (0)