Skip to content

Commit 937e1ff

Browse files
committed
Removed unused field/parameter
1 parent 5c5c176 commit 937e1ff

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

internal/arduino/builder/builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func NewBuilder(
189189
}
190190

191191
logger := logger.New(stdout, stderr, verbose, warningsLevel)
192-
libsManager, libsResolver, verboseOut, err := detector.LibrariesLoader(
192+
libsResolver, verboseOut, err := detector.LibrariesLoader(
193193
useCachedLibrariesResolution, librariesManager,
194194
builtInLibrariesDirs, libraryDirs, otherLibrariesDirs,
195195
actualPlatform, targetPlatform,
@@ -238,7 +238,7 @@ func NewBuilder(
238238
),
239239
diagnosticStore: diagnosticStore,
240240
libsDetector: detector.NewSketchLibrariesDetector(
241-
libsManager, libsResolver,
241+
libsResolver,
242242
useCachedLibrariesResolution,
243243
onlyUpdateCompilationDatabase,
244244
logger,

internal/arduino/builder/internal/detector/detector.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ type libraryResolutionResult struct {
4949

5050
// SketchLibrariesDetector todo
5151
type SketchLibrariesDetector struct {
52-
librariesManager *librariesmanager.LibrariesManager
5352
librariesResolver *librariesresolver.Cpp
5453
useCachedLibrariesResolution bool
5554
onlyUpdateCompilationDatabase bool
@@ -62,15 +61,13 @@ type SketchLibrariesDetector struct {
6261

6362
// NewSketchLibrariesDetector todo
6463
func NewSketchLibrariesDetector(
65-
lm *librariesmanager.LibrariesManager,
6664
libsResolver *librariesresolver.Cpp,
6765
useCachedLibrariesResolution bool,
6866
onlyUpdateCompilationDatabase bool,
6967
logger *logger.BuilderLogger,
7068
diagnosticStore *diagnostics.Store,
7169
) *SketchLibrariesDetector {
7270
return &SketchLibrariesDetector{
73-
librariesManager: lm,
7471
librariesResolver: libsResolver,
7572
useCachedLibrariesResolution: useCachedLibrariesResolution,
7673
librariesResolutionResults: map[string]libraryResolutionResult{},
@@ -599,7 +596,7 @@ func LibrariesLoader(
599596
librariesManager *librariesmanager.LibrariesManager,
600597
builtInLibrariesDirs *paths.Path, libraryDirs, otherLibrariesDirs paths.PathList,
601598
actualPlatform, targetPlatform *cores.PlatformRelease,
602-
) (*librariesmanager.LibrariesManager, *librariesresolver.Cpp, []byte, error) {
599+
) (*librariesresolver.Cpp, []byte, error) {
603600
verboseOut := &bytes.Buffer{}
604601
lm := librariesManager
605602
if useCachedLibrariesResolution {
@@ -613,7 +610,7 @@ func LibrariesLoader(
613610
builtInLibrariesFolders := builtInLibrariesDirs
614611
if builtInLibrariesFolders != nil {
615612
if err := builtInLibrariesFolders.ToAbs(); err != nil {
616-
return nil, nil, nil, err
613+
return nil, nil, err
617614
}
618615
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
619616
Path: builtInLibrariesFolders,
@@ -636,7 +633,7 @@ func LibrariesLoader(
636633

637634
librariesFolders := otherLibrariesDirs
638635
if err := librariesFolders.ToAbs(); err != nil {
639-
return nil, nil, nil, err
636+
return nil, nil, err
640637
}
641638
for _, folder := range librariesFolders {
642639
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
@@ -668,7 +665,7 @@ func LibrariesLoader(
668665

669666
allLibs := lm.FindAllInstalled()
670667
resolver := librariesresolver.NewCppResolver(allLibs, targetPlatform, actualPlatform)
671-
return lm, resolver, verboseOut.Bytes(), nil
668+
return resolver, verboseOut.Bytes(), nil
672669
}
673670

674671
type includeCacheEntry struct {

0 commit comments

Comments
 (0)