pkg: replace algorithms with go.bug.st/f

arduino · Jan 13, 2025 · f4cbfed · f4cbfed
1 parent 34e79e1
commit f4cbfed
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 155 deletions.
diff --git a/.licenses/go/go.bug.st/f.dep.yml b/.licenses/go/go.bug.st/f.dep.yml
@@ -0,0 +1,45 @@
+---
+name: go.bug.st/f
+version: v0.4.0
+type: go
+summary: Package f is a golang library implementing some basic algorithms.
+homepage: https://godoc.org/go.bug.st/f
+license: bsd-3-clause
+licenses:
+- sources: LICENSE
+  text: |2+
+
+    Copyright (c) 2024, Cristian Maglie.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+       the documentation and/or other materials provided with the
+       distribution.
+
+    3. Neither the name of the copyright holder nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+notices: []
+...
diff --git a/commands/service_board_list.go b/commands/service_board_list.go
@@ -22,12 +22,12 @@ import (
 
 	"github.com/arduino/arduino-cli/commands/cmderrors"
 	"github.com/arduino/arduino-cli/commands/internal/instances"
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/arduino/discovery/discoverymanager"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/arduino-cli/pkg/fqbn"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/sirupsen/logrus"
+	"go.bug.st/f"
 )
 
 // BoardList returns a list of boards found by the loaded discoveries.

diff --git a/commands/service_settings.go b/commands/service_settings.go
@@ -22,10 +22,10 @@ import (
 	"reflect"
 
 	"github.com/arduino/arduino-cli/commands/cmderrors"
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/cli/configuration"
 	"github.com/arduino/arduino-cli/internal/go-configmap"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
+	"go.bug.st/f"
 	"google.golang.org/protobuf/proto"
 	"gopkg.in/yaml.v3"
 )

diff --git a/internal/algorithms/slices.go b/internal/algorithms/slices.go
diff --git a/internal/algorithms/slices_test.go b/internal/algorithms/slices_test.go
diff --git a/internal/arduino/builder/core.go b/internal/arduino/builder/core.go
@@ -22,12 +22,12 @@ import (
 	"os"
 	"strings"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/arduino/builder/cpp"
 	"github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils"
 	"github.com/arduino/arduino-cli/internal/buildcache"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/go-paths-helper"
+	"go.bug.st/f"
 )
 
 // buildCore fixdoc

diff --git a/internal/arduino/builder/internal/preprocessor/gcc.go b/internal/arduino/builder/internal/preprocessor/gcc.go
@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"strings"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/arduino/builder/cpp"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-orderedmap"
+	"go.bug.st/f"
 )
 
 // GCC performs a run of the gcc preprocess (macro/includes expansion). The function outputs the result

diff --git a/internal/arduino/builder/internal/utils/utils.go b/internal/arduino/builder/internal/utils/utils.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"unicode"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
+	"go.bug.st/f"
 	"golang.org/x/text/runes"
 	"golang.org/x/text/transform"
 	"golang.org/x/text/unicode/norm"

diff --git a/internal/arduino/builder/libraries.go b/internal/arduino/builder/libraries.go
@@ -20,12 +20,12 @@ import (
 	"strings"
 	"time"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/arduino/builder/cpp"
 	"github.com/arduino/arduino-cli/internal/arduino/libraries"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-orderedmap"
+	"go.bug.st/f"
 )
 
 // nolint

diff --git a/internal/arduino/builder/linker.go b/internal/arduino/builder/linker.go
@@ -18,9 +18,9 @@ package builder
 import (
 	"strings"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/go-paths-helper"
+	"go.bug.st/f"
 )
 
 // link fixdoc

diff --git a/internal/arduino/builder/sketch.go b/internal/arduino/builder/sketch.go
@@ -25,11 +25,11 @@ import (
 	"strings"
 
 	"fortio.org/safecast"
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/arduino/builder/cpp"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/go-paths-helper"
 	"github.com/marcinbor85/gohex"
+	"go.bug.st/f"
 )
 
 var (

diff --git a/internal/arduino/sketch/sketch.go b/internal/arduino/sketch/sketch.go
@@ -24,11 +24,11 @@ import (
 	"strings"
 
 	"github.com/arduino/arduino-cli/commands/cmderrors"
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/arduino/globals"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/go-paths-helper"
+	"go.bug.st/f"
 )
 
 // Sketch holds all the files composing a sketch

diff --git a/internal/cli/arguments/completion.go b/internal/cli/arguments/completion.go
@@ -18,9 +18,9 @@ package arguments
 import (
 	"context"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
+	"go.bug.st/f"
 )
 
 // GetInstalledBoards is an helper function useful to autocomplete.

diff --git a/internal/cli/arguments/port.go b/internal/cli/arguments/port.go
@@ -23,11 +23,11 @@ import (
 
 	"github.com/arduino/arduino-cli/commands"
 	"github.com/arduino/arduino-cli/commands/cmderrors"
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"go.bug.st/f"
 )
 
 // Port contains the port arguments result.

diff --git a/internal/cli/arguments/sketch.go b/internal/cli/arguments/sketch.go
@@ -18,12 +18,12 @@ package arguments
 import (
 	"context"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
+	"go.bug.st/f"
 )
 
 // InitSketchPath returns an instance of paths.Path pointing to sketchPath.

diff --git a/internal/cli/config/config.go b/internal/cli/config/config.go
@@ -20,12 +20,12 @@ import (
 	"os"
 	"strings"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/go-paths-helper"
 	"github.com/spf13/cobra"
+	"go.bug.st/f"
 )
 
 // NewCommand created a new `config` command

diff --git a/internal/cli/config/set.go b/internal/cli/config/set.go
@@ -20,12 +20,12 @@ import (
 	"encoding/json"
 	"os"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"go.bug.st/f"
 )
 
 func initSetCommand(srv rpc.ArduinoCoreServiceServer) *cobra.Command {

diff --git a/internal/cli/feedback/result/rpc.go b/internal/cli/feedback/result/rpc.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"slices"
 
-	f "github.com/arduino/arduino-cli/internal/algorithms"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/arduino-cli/internal/orderedmap"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
+	"go.bug.st/f"
 	semver "go.bug.st/relaxed-semver"
 )