Skip to content

Commit ca07725

Browse files
committed
Removed unused field/parameter
1 parent 241e7d4 commit ca07725

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
@@ -190,7 +190,7 @@ func NewBuilder(
190190
}
191191

192192
log := logger.New(stdout, stderr, verbosity, warningsLevel)
193-
libsManager, libsResolver, verboseOut, err := detector.LibrariesLoader(
193+
libsResolver, verboseOut, err := detector.LibrariesLoader(
194194
useCachedLibrariesResolution, librariesManager,
195195
builtInLibrariesDirs, libraryDirs, otherLibrariesDirs,
196196
actualPlatform, targetPlatform,
@@ -239,7 +239,7 @@ func NewBuilder(
239239
),
240240
diagnosticStore: diagnosticStore,
241241
libsDetector: detector.NewSketchLibrariesDetector(
242-
libsManager, libsResolver,
242+
libsResolver,
243243
useCachedLibrariesResolution,
244244
onlyUpdateCompilationDatabase,
245245
log,

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{},
@@ -598,7 +595,7 @@ func LibrariesLoader(
598595
librariesManager *librariesmanager.LibrariesManager,
599596
builtInLibrariesDirs *paths.Path, libraryDirs, otherLibrariesDirs paths.PathList,
600597
actualPlatform, targetPlatform *cores.PlatformRelease,
601-
) (*librariesmanager.LibrariesManager, *librariesresolver.Cpp, []byte, error) {
598+
) (*librariesresolver.Cpp, []byte, error) {
602599
verboseOut := &bytes.Buffer{}
603600
lm := librariesManager
604601
if useCachedLibrariesResolution {
@@ -612,7 +609,7 @@ func LibrariesLoader(
612609
builtInLibrariesFolders := builtInLibrariesDirs
613610
if builtInLibrariesFolders != nil {
614611
if err := builtInLibrariesFolders.ToAbs(); err != nil {
615-
return nil, nil, nil, err
612+
return nil, nil, err
616613
}
617614
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
618615
Path: builtInLibrariesFolders,
@@ -635,7 +632,7 @@ func LibrariesLoader(
635632

636633
librariesFolders := otherLibrariesDirs
637634
if err := librariesFolders.ToAbs(); err != nil {
638-
return nil, nil, nil, err
635+
return nil, nil, err
639636
}
640637
for _, folder := range librariesFolders {
641638
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
@@ -667,7 +664,7 @@ func LibrariesLoader(
667664

668665
allLibs := lm.FindAllInstalled()
669666
resolver := librariesresolver.NewCppResolver(allLibs, targetPlatform, actualPlatform)
670-
return lm, resolver, verboseOut.Bytes(), nil
667+
return resolver, verboseOut.Bytes(), nil
671668
}
672669

673670
type includeCacheEntry struct {

0 commit comments

Comments
 (0)