@@ -49,7 +49,6 @@ type libraryResolutionResult struct {
49
49
50
50
// SketchLibrariesDetector todo
51
51
type SketchLibrariesDetector struct {
52
- librariesManager * librariesmanager.LibrariesManager
53
52
librariesResolver * librariesresolver.Cpp
54
53
useCachedLibrariesResolution bool
55
54
onlyUpdateCompilationDatabase bool
@@ -62,15 +61,13 @@ type SketchLibrariesDetector struct {
62
61
63
62
// NewSketchLibrariesDetector todo
64
63
func NewSketchLibrariesDetector (
65
- lm * librariesmanager.LibrariesManager ,
66
64
libsResolver * librariesresolver.Cpp ,
67
65
useCachedLibrariesResolution bool ,
68
66
onlyUpdateCompilationDatabase bool ,
69
67
logger * logger.BuilderLogger ,
70
68
diagnosticStore * diagnostics.Store ,
71
69
) * SketchLibrariesDetector {
72
70
return & SketchLibrariesDetector {
73
- librariesManager : lm ,
74
71
librariesResolver : libsResolver ,
75
72
useCachedLibrariesResolution : useCachedLibrariesResolution ,
76
73
librariesResolutionResults : map [string ]libraryResolutionResult {},
@@ -598,7 +595,7 @@ func LibrariesLoader(
598
595
librariesManager * librariesmanager.LibrariesManager ,
599
596
builtInLibrariesDirs * paths.Path , libraryDirs , otherLibrariesDirs paths.PathList ,
600
597
actualPlatform , targetPlatform * cores.PlatformRelease ,
601
- ) (* librariesmanager. LibrariesManager , * librariesresolver.Cpp , []byte , error ) {
598
+ ) (* librariesresolver.Cpp , []byte , error ) {
602
599
verboseOut := & bytes.Buffer {}
603
600
lm := librariesManager
604
601
if useCachedLibrariesResolution {
@@ -612,7 +609,7 @@ func LibrariesLoader(
612
609
builtInLibrariesFolders := builtInLibrariesDirs
613
610
if builtInLibrariesFolders != nil {
614
611
if err := builtInLibrariesFolders .ToAbs (); err != nil {
615
- return nil , nil , nil , err
612
+ return nil , nil , err
616
613
}
617
614
lmb .AddLibrariesDir (librariesmanager.LibrariesDir {
618
615
Path : builtInLibrariesFolders ,
@@ -635,7 +632,7 @@ func LibrariesLoader(
635
632
636
633
librariesFolders := otherLibrariesDirs
637
634
if err := librariesFolders .ToAbs (); err != nil {
638
- return nil , nil , nil , err
635
+ return nil , nil , err
639
636
}
640
637
for _ , folder := range librariesFolders {
641
638
lmb .AddLibrariesDir (librariesmanager.LibrariesDir {
@@ -667,7 +664,7 @@ func LibrariesLoader(
667
664
668
665
allLibs := lm .FindAllInstalled ()
669
666
resolver := librariesresolver .NewCppResolver (allLibs , targetPlatform , actualPlatform )
670
- return lm , resolver , verboseOut .Bytes (), nil
667
+ return resolver , verboseOut .Bytes (), nil
671
668
}
672
669
673
670
type includeCacheEntry struct {
0 commit comments