Skip to content

Commit 5ec74a8

Browse files
stefanotorneostefanotorneo
committed
fix formatting
1 parent 153a6fa commit 5ec74a8

File tree

52 files changed

+213
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+213
-213
lines changed

‎arduino/builder/sketch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func SketchMergeSources(sk *sketch.Sketch, overrides map[string]string) (int, st
7373
}
7474
data, err := f.ReadFile()
7575
if err != nil {
76-
return "", fmt.Errorf(tr("reading file %[1]s: %[2]s"), f, err)
76+
return "", fmt.Errorf("reading file %[1]s: %[2]s", f, err)
7777
}
7878
return string(data), nil
7979
}

‎arduino/cores/board.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ func (b *Board) GetBuildProperties(userConfigs *properties.Map) (*properties.Map
130130
// Check for residual invalid options...
131131
for option, value := range config.AsMap() {
132132
if option == "" {
133-
return nil, fmt.Errorf(tr("invalid empty option found"))
133+
return nil, fmt.Errorf("invalid empty option found")
134134
}
135135
if _, ok := b.configOptions.GetOk(option); !ok {
136-
return nil, fmt.Errorf(tr("invalid option '%s'"), option)
136+
return nil, fmt.Errorf("invalid option '%s'", option)
137137
}
138138
optionsConf, ok := b.configOptionProperties[option+"="+value]
139139
if !ok {
140-
return nil, fmt.Errorf(tr("invalid value '%[1]s' for option '%[2]s'"), value, option)
140+
return nil, fmt.Errorf("invalid value '%[1]s' for option '%[2]s'", value, option)
141141
}
142142
buildProperties.Merge(optionsConf)
143143
}
@@ -153,7 +153,7 @@ func (b *Board) GetBuildProperties(userConfigs *properties.Map) (*properties.Map
153153
func (b *Board) GeneratePropertiesForConfiguration(config string) (*properties.Map, error) {
154154
fqbn, err := ParseFQBN(b.String() + ":" + config)
155155
if err != nil {
156-
return nil, fmt.Errorf(tr("parsing fqbn: %s"), err)
156+
return nil, fmt.Errorf("parsing fqbn: %s", err)
157157
}
158158
return b.GetBuildProperties(fqbn.Configs)
159159
}

‎arduino/cores/fqbn.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ func ParseFQBN(fqbnIn string) (*FQBN, error) {
4545
Configs: properties.NewMap(),
4646
}
4747
if fqbn.BoardID == "" {
48-
return nil, fmt.Errorf(tr("empty board identifier"))
48+
return nil, fmt.Errorf("empty board identifier")
4949
}
5050
if len(fqbnParts) > 3 {
5151
for _, pair := range strings.Split(fqbnParts[3], ",") {
5252
parts := strings.SplitN(pair, "=", 2)
5353
if len(parts) != 2 {
54-
return nil, fmt.Errorf(tr("invalid config option: %s"), pair)
54+
return nil, fmt.Errorf("invalid config option: %s", pair)
5555
}
5656
k := strings.TrimSpace(parts[0])
5757
v := strings.TrimSpace(parts[1])
5858
if k == "" {
59-
return nil, fmt.Errorf(tr("invalid config option: %s"), pair)
59+
return nil, fmt.Errorf("invalid config option: %s", pair)
6060
}
6161
fqbn.Configs.Set(k, v)
6262
}

‎arduino/cores/packageindex/index.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ func (inPlatformRelease indexPlatformRelease) extractPlatformIn(outPackage *core
275275

276276
size, err := inPlatformRelease.Size.Int64()
277277
if err != nil {
278-
return fmt.Errorf(tr("invalid platform archive size: %s"), err)
278+
return fmt.Errorf("invalid platform archive size: %s", err)
279279
}
280280
outPlatformRelease := outPlatform.GetOrCreateRelease(inPlatformRelease.Version)
281281
outPlatformRelease.IsTrusted = trusted

‎arduino/cores/packagemanager/download.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,45 +73,45 @@ func (pme *Explorer) FindPlatformRelease(ref *PlatformReference) *cores.Platform
7373
func (pme *Explorer) FindPlatformReleaseDependencies(item *PlatformReference) (*cores.PlatformRelease, []*cores.ToolRelease, error) {
7474
targetPackage, exists := pme.packages[item.Package]
7575
if !exists {
76-
return nil, nil, fmt.Errorf(tr("package %s not found"), item.Package)
76+
return nil, nil, fmt.Errorf("package %s not found", item.Package)
7777
}
7878
platform, exists := targetPackage.Platforms[item.PlatformArchitecture]
7979
if !exists {
80-
return nil, nil, fmt.Errorf(tr("platform %[1]s not found in package %[2]s"), item.PlatformArchitecture, targetPackage.String())
80+
return nil, nil, fmt.Errorf("platform %[1]s not found in package %[2]s", item.PlatformArchitecture, targetPackage.String())
8181
}
8282

8383
var release *cores.PlatformRelease
8484
if item.PlatformVersion != nil {
8585
release = platform.FindReleaseWithVersion(item.PlatformVersion)
8686
if release == nil {
87-
return nil, nil, fmt.Errorf(tr("required version %[1]s not found for platform %[2]s"), item.PlatformVersion, platform.String())
87+
return nil, nil, fmt.Errorf("required version %[1]s not found for platform %[2]s", item.PlatformVersion, platform.String())
8888
}
8989
} else {
9090
release = platform.GetLatestRelease()
9191
if release == nil {
92-
return nil, nil, fmt.Errorf(tr("platform %s has no available releases"), platform.String())
92+
return nil, nil, fmt.Errorf("platform %s has no available releases", platform.String())
9393
}
9494
}
9595

9696
// replaces "latest" with latest version too
9797
toolDeps, err := pme.packages.GetPlatformReleaseToolDependencies(release)
9898
if err != nil {
99-
return nil, nil, fmt.Errorf(tr("getting tool dependencies for platform %[1]s: %[2]s"), release.String(), err)
99+
return nil, nil, fmt.Errorf("getting tool dependencies for platform %[1]s: %[2]s", release.String(), err)
100100
}
101101

102102
// discovery dependencies differ from normal tool since we always want to use the latest
103103
// available version for the platform package
104104
discoveryDependencies, err := pme.packages.GetPlatformReleaseDiscoveryDependencies(release)
105105
if err != nil {
106-
return nil, nil, fmt.Errorf(tr("getting discovery dependencies for platform %[1]s: %[2]s"), release.String(), err)
106+
return nil, nil, fmt.Errorf("getting discovery dependencies for platform %[1]s: %[2]s", release.String(), err)
107107
}
108108
toolDeps = append(toolDeps, discoveryDependencies...)
109109

110110
// monitor dependencies differ from normal tool since we always want to use the latest
111111
// available version for the platform package
112112
monitorDependencies, err := pme.packages.GetPlatformReleaseMonitorDependencies(release)
113113
if err != nil {
114-
return nil, nil, fmt.Errorf(tr("getting monitor dependencies for platform %[1]s: %[2]s"), release.String(), err)
114+
return nil, nil, fmt.Errorf("getting monitor dependencies for platform %[1]s: %[2]s", release.String(), err)
115115
}
116116
toolDeps = append(toolDeps, monitorDependencies...)
117117

‎arduino/cores/packagemanager/install_uninstall.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,20 +273,20 @@ func (pme *Explorer) UninstallPlatform(platformRelease *cores.PlatformRelease, t
273273
taskCB(&rpc.TaskProgress{Name: tr("Uninstalling %s", platformRelease)})
274274

275275
if platformRelease.InstallDir == nil {
276-
err := fmt.Errorf(tr("platform not installed"))
276+
err := fmt.Errorf("platform not installed")
277277
log.WithError(err).Error("Error uninstalling")
278278
return &arduino.FailedUninstallError{Message: err.Error()}
279279
}
280280

281281
// Safety measure
282282
if !pme.IsManagedPlatformRelease(platformRelease) {
283-
err := fmt.Errorf(tr("%s is not managed by package manager"), platformRelease)
283+
err := fmt.Errorf("%s is not managed by package manager", platformRelease)
284284
log.WithError(err).Error("Error uninstalling")
285285
return &arduino.FailedUninstallError{Message: err.Error()}
286286
}
287287

288288
if err := platformRelease.InstallDir.RemoveAll(); err != nil {
289-
err = fmt.Errorf(tr("removing platform files: %s"), err)
289+
err = fmt.Errorf("removing platform files: %s", err)
290290
log.WithError(err).Error("Error uninstalling")
291291
return &arduino.FailedUninstallError{Message: err.Error()}
292292
}
@@ -313,7 +313,7 @@ func (pme *Explorer) InstallTool(toolRelease *cores.ToolRelease, taskCB rpc.Task
313313

314314
toolResource := toolRelease.GetCompatibleFlavour()
315315
if toolResource == nil {
316-
return fmt.Errorf(tr("no compatible version of %s tools found for the current os"), toolRelease.Tool.Name)
316+
return fmt.Errorf("no compatible version of %s tools found for the current os", toolRelease.Tool.Name)
317317
}
318318
destDir := pme.PackagesDir.Join(
319319
toolRelease.Tool.Package.Name,
@@ -357,7 +357,7 @@ func (pme *Explorer) UninstallTool(toolRelease *cores.ToolRelease, taskCB rpc.Ta
357357
log.Info("Uninstalling tool")
358358

359359
if toolRelease.InstallDir == nil {
360-
return fmt.Errorf(tr("tool not installed"))
360+
return fmt.Errorf("tool not installed")
361361
}
362362

363363
// Safety measure

‎arduino/cores/packagemanager/loader.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ func (pm *Builder) loadPlatformRelease(platform *cores.PlatformRelease, path *pa
298298
// if we don't load it some information about the platform is lost
299299
if installedJSONPath.Exist() {
300300
if _, err := pm.LoadPackageIndexFromFile(installedJSONPath); err != nil {
301-
return fmt.Errorf(tr("loading %[1]s: %[2]s"), installedJSONPath, err)
301+
return fmt.Errorf("loading %[1]s: %[2]s", installedJSONPath, err)
302302
}
303303
}
304304

@@ -307,12 +307,12 @@ func (pm *Builder) loadPlatformRelease(platform *cores.PlatformRelease, path *pa
307307
if p, err := properties.SafeLoad(platformTxtPath.String()); err == nil {
308308
platform.Properties.Merge(p)
309309
} else {
310-
return fmt.Errorf(tr("loading %[1]s: %[2]s"), platformTxtPath, err)
310+
return fmt.Errorf("loading %[1]s: %[2]s", platformTxtPath, err)
311311
}
312312
if p, err := properties.SafeLoad(platformTxtLocalPath.String()); err == nil {
313313
platform.Properties.Merge(p)
314314
} else {
315-
return fmt.Errorf(tr("loading %[1]s: %[2]s"), platformTxtLocalPath, err)
315+
return fmt.Errorf("loading %[1]s: %[2]s", platformTxtLocalPath, err)
316316
}
317317

318318
if platform.Properties.SubTree("pluggable_discovery").Size() > 0 {
@@ -348,7 +348,7 @@ func (pm *Builder) loadPlatformRelease(platform *cores.PlatformRelease, path *pa
348348
}
349349

350350
if err := pm.loadBoards(platform); err != nil {
351-
return fmt.Errorf(tr("loading boards: %s"), err)
351+
return fmt.Errorf("loading boards: %s", err)
352352
}
353353

354354
if !platform.PluggableDiscoveryAware {
@@ -360,7 +360,7 @@ func (pm *Builder) loadPlatformRelease(platform *cores.PlatformRelease, path *pa
360360
for protocol, ref := range platform.Properties.SubTree("pluggable_monitor.required").AsMap() {
361361
split := strings.Split(ref, ":")
362362
if len(split) != 2 {
363-
return fmt.Errorf(tr("invalid pluggable monitor reference: %s"), ref)
363+
return fmt.Errorf("invalid pluggable monitor reference: %s", ref)
364364
}
365365
pm.log.WithField("protocol", protocol).WithField("tool", ref).Info("Adding monitor tool")
366366
platform.Monitors[protocol] = &cores.MonitorDependency{
@@ -454,7 +454,7 @@ func (pm *Builder) loadProgrammer(programmerProperties *properties.Map) *cores.P
454454

455455
func (pm *Builder) loadBoards(platform *cores.PlatformRelease) error {
456456
if platform.InstallDir == nil {
457-
return fmt.Errorf(tr("platform not installed"))
457+
return fmt.Errorf("platform not installed")
458458
}
459459

460460
boardsTxtPath := platform.InstallDir.Join("boards.txt")
@@ -699,7 +699,7 @@ func (pm *Builder) LoadToolsFromBundleDirectory(toolsPath *paths.Path) error {
699699
return nil
700700
}
701701
if err := filepath.Walk(toolsPath.String(), findBuiltInToolsVersionsTxt); err != nil {
702-
return fmt.Errorf(tr("searching for builtin_tools_versions.txt in %[1]s: %[2]s"), toolsPath, err)
702+
return fmt.Errorf("searching for builtin_tools_versions.txt in %[1]s: %[2]s", toolsPath, err)
703703
}
704704

705705
if builtinToolsVersionsTxtPath != "" {
@@ -708,12 +708,12 @@ func (pm *Builder) LoadToolsFromBundleDirectory(toolsPath *paths.Path) error {
708708
pm.log.Infof("Found builtin_tools_versions.txt")
709709
toolPath, err := paths.New(builtinToolsVersionsTxtPath).Parent().Abs()
710710
if err != nil {
711-
return fmt.Errorf(tr("getting parent dir of %[1]s: %[2]s"), builtinToolsVersionsTxtPath, err)
711+
return fmt.Errorf("getting parent dir of %[1]s: %[2]s", builtinToolsVersionsTxtPath, err)
712712
}
713713

714714
all, err := properties.Load(builtinToolsVersionsTxtPath)
715715
if err != nil {
716-
return fmt.Errorf(tr("reading %[1]s: %[2]s"), builtinToolsVersionsTxtPath, err)
716+
return fmt.Errorf("reading %[1]s: %[2]s", builtinToolsVersionsTxtPath, err)
717717
}
718718

719719
for packager, toolsData := range all.FirstLevelOf() {

‎arduino/cores/packagemanager/package_manager.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func (pme *Explorer) FindBoardsWithID(id string) []*cores.Board {
232232
func (pme *Explorer) FindBoardWithFQBN(fqbnIn string) (*cores.Board, error) {
233233
fqbn, err := cores.ParseFQBN(fqbnIn)
234234
if err != nil {
235-
return nil, fmt.Errorf(tr("parsing fqbn: %s"), err)
235+
return nil, fmt.Errorf("parsing fqbn: %s", err)
236236
}
237237

238238
_, _, board, _, _, err := pme.ResolveFQBN(fqbn)
@@ -266,32 +266,32 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
266266
targetPackage := pme.packages[fqbn.Package]
267267
if targetPackage == nil {
268268
return nil, nil, nil, nil, nil,
269-
fmt.Errorf(tr("unknown package %s"), fqbn.Package)
269+
fmt.Errorf("unknown package %s", fqbn.Package)
270270
}
271271

272272
// Find platform
273273
platform := targetPackage.Platforms[fqbn.PlatformArch]
274274
if platform == nil {
275275
return targetPackage, nil, nil, nil, nil,
276-
fmt.Errorf(tr("unknown platform %s:%s"), targetPackage, fqbn.PlatformArch)
276+
fmt.Errorf("unknown platform %s:%s", targetPackage, fqbn.PlatformArch)
277277
}
278278
platformRelease := pme.GetInstalledPlatformRelease(platform)
279279
if platformRelease == nil {
280280
return targetPackage, nil, nil, nil, nil,
281-
fmt.Errorf(tr("platform %s is not installed"), platform)
281+
fmt.Errorf("platform %s is not installed", platform)
282282
}
283283

284284
// Find board
285285
board := platformRelease.Boards[fqbn.BoardID]
286286
if board == nil {
287287
return targetPackage, platformRelease, nil, nil, nil,
288-
fmt.Errorf(tr("board %s not found"), fqbn.StringWithoutConfig())
288+
fmt.Errorf("board %s not found", fqbn.StringWithoutConfig())
289289
}
290290

291291
buildProperties, err := board.GetBuildProperties(fqbn.Configs)
292292
if err != nil {
293293
return targetPackage, platformRelease, board, nil, nil,
294-
fmt.Errorf(tr("getting build properties for board %[1]s: %[2]s"), board, err)
294+
fmt.Errorf("getting build properties for board %[1]s: %[2]s", board, err)
295295
}
296296

297297
// Determine the platform used for the build (in case the board refers
@@ -303,17 +303,17 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
303303
buildPackage := pme.packages[referredPackage]
304304
if buildPackage == nil {
305305
return targetPackage, platformRelease, board, buildProperties, nil,
306-
fmt.Errorf(tr("missing package %[1]s referenced by board %[2]s"), referredPackage, fqbn)
306+
fmt.Errorf("missing package %[1]s referenced by board %[2]s", referredPackage, fqbn)
307307
}
308308
buildPlatform := buildPackage.Platforms[fqbn.PlatformArch]
309309
if buildPlatform == nil {
310310
return targetPackage, platformRelease, board, buildProperties, nil,
311-
fmt.Errorf(tr("missing platform %[1]s:%[2]s referenced by board %[3]s"), referredPackage, fqbn.PlatformArch, fqbn)
311+
fmt.Errorf("missing platform %[1]s:%[2]s referenced by board %[3]s", referredPackage, fqbn.PlatformArch, fqbn)
312312
}
313313
buildPlatformRelease = pme.GetInstalledPlatformRelease(buildPlatform)
314314
if buildPlatformRelease == nil {
315315
return targetPackage, platformRelease, board, buildProperties, nil,
316-
fmt.Errorf(tr("missing platform release %[1]s:%[2]s referenced by board %[3]s"), referredPackage, fqbn.PlatformArch, fqbn)
316+
fmt.Errorf("missing platform release %[1]s:%[2]s referenced by board %[3]s", referredPackage, fqbn.PlatformArch, fqbn)
317317
}
318318
}
319319

@@ -330,7 +330,7 @@ func (pmb *Builder) LoadPackageIndex(URL *url.URL) error {
330330
indexPath := pmb.IndexDir.Join(indexFileName)
331331
index, err := packageindex.LoadIndex(indexPath)
332332
if err != nil {
333-
return fmt.Errorf(tr("loading json index file %[1]s: %[2]s"), indexPath, err)
333+
return fmt.Errorf("loading json index file %[1]s: %[2]s", indexPath, err)
334334
}
335335

336336
for _, p := range index.Packages {
@@ -345,7 +345,7 @@ func (pmb *Builder) LoadPackageIndex(URL *url.URL) error {
345345
func (pmb *Builder) LoadPackageIndexFromFile(indexPath *paths.Path) (*packageindex.Index, error) {
346346
index, err := packageindex.LoadIndex(indexPath)
347347
if err != nil {
348-
return nil, fmt.Errorf(tr("loading json index file %[1]s: %[2]s"), indexPath, err)
348+
return nil, fmt.Errorf("loading json index file %[1]s: %[2]s", indexPath, err)
349349
}
350350

351351
index.MergeIntoPackages(pmb.packages)
@@ -359,7 +359,7 @@ func (pme *Explorer) Package(name string) *PackageActions {
359359
var err error
360360
thePackage := pme.packages[name]
361361
if thePackage == nil {
362-
err = fmt.Errorf(tr("package '%s' not found"), name)
362+
err = fmt.Errorf("package '%s' not found", name)
363363
}
364364
return &PackageActions{
365365
aPackage: thePackage,
@@ -385,7 +385,7 @@ func (pa *PackageActions) Tool(name string) *ToolActions {
385385
tool = pa.aPackage.Tools[name]
386386

387387
if tool == nil {
388-
err = fmt.Errorf(tr("tool '%[1]s' not found in package '%[2]s'"), name, pa.aPackage.Name)
388+
err = fmt.Errorf("tool '%[1]s' not found in package '%[2]s'", name, pa.aPackage.Name)
389389
}
390390
}
391391
return &ToolActions{
@@ -435,7 +435,7 @@ func (ta *ToolActions) Release(version *semver.RelaxedVersion) *ToolReleaseActio
435435
}
436436
release := ta.tool.FindReleaseWithRelaxedVersion(version)
437437
if release == nil {
438-
return &ToolReleaseActions{forwardError: fmt.Errorf(tr("release %[1]s not found for tool %[2]s"), version, ta.tool.String())}
438+
return &ToolReleaseActions{forwardError: fmt.Errorf("release %[1]s not found for tool %[2]s", version, ta.tool.String())}
439439
}
440440
return &ToolReleaseActions{release: release}
441441
}
@@ -565,7 +565,7 @@ func (pme *Explorer) FindToolsRequiredFromPlatformRelease(platform *cores.Platfo
565565
pme.log.WithField("tool", toolDep).Infof("Required tool")
566566
tool := pme.FindToolDependency(toolDep)
567567
if tool == nil {
568-
return nil, fmt.Errorf(tr("tool release not found: %s"), toolDep)
568+
return nil, fmt.Errorf("tool release not found: %s", toolDep)
569569
}
570570
requiredTools = append(requiredTools, tool)
571571
delete(foundTools, tool.Tool.Name)
@@ -576,7 +576,7 @@ func (pme *Explorer) FindToolsRequiredFromPlatformRelease(platform *cores.Platfo
576576
pme.log.WithField("discovery", discoveryDep).Infof("Required discovery")
577577
tool := pme.FindDiscoveryDependency(discoveryDep)
578578
if tool == nil {
579-
return nil, fmt.Errorf(tr("discovery release not found: %s"), discoveryDep)
579+
return nil, fmt.Errorf("discovery release not found: %s", discoveryDep)
580580
}
581581
requiredTools = append(requiredTools, tool)
582582
delete(foundTools, tool.Tool.Name)
@@ -587,7 +587,7 @@ func (pme *Explorer) FindToolsRequiredFromPlatformRelease(platform *cores.Platfo
587587
pme.log.WithField("monitor", monitorDep).Infof("Required monitor")
588588
tool := pme.FindMonitorDependency(monitorDep)
589589
if tool == nil {
590-
return nil, fmt.Errorf(tr("monitor release not found: %s"), monitorDep)
590+
return nil, fmt.Errorf("monitor release not found: %s", monitorDep)
591591
}
592592
requiredTools = append(requiredTools, tool)
593593
delete(foundTools, tool.Tool.Name)
@@ -642,7 +642,7 @@ func (pme *Explorer) FindToolsRequiredForBoard(board *cores.Board) ([]*cores.Too
642642
pme.log.WithField("tool", toolDep).Infof("Required tool")
643643
tool := pme.FindToolDependency(toolDep)
644644
if tool == nil {
645-
return nil, fmt.Errorf(tr("tool release not found: %s"), toolDep)
645+
return nil, fmt.Errorf("tool release not found: %s", toolDep)
646646
}
647647
requiredTools = append(requiredTools, tool)
648648
delete(foundTools, tool.Tool.Name)

0 commit comments

Comments
 (0)