Skip to content

Commit 48f3397

Browse files
committed
Fixing up formatting
1 parent 3eb0c61 commit 48f3397

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

src/App/Fossa/Analyze/ScanSummary.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ renderDefaultSkippedTargetHelp =
193193
]
194194

195195
summarize :: Config.AnalyzeConfig -> Text -> AnalysisScanResult -> Maybe ([Doc AnsiStyle])
196-
summarize cfg endpointVersion (AnalysisScanResult dps vsi binary ficus manualDeps dynamicLinkingDeps lernie reachabilityAttempts) =
196+
summarize cfg endpointVersion (AnalysisScanResult dps vsi binary _ manualDeps dynamicLinkingDeps lernie reachabilityAttempts) =
197197
if (numProjects totalScanCount <= 0)
198198
then Nothing
199199
else

src/App/Fossa/Ficus/Analyze.hs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import Fossa.API.Types (ApiKey (..), ApiOpts (..))
4444
import Path (Abs, Dir, File, Path, toFilePath)
4545
import Srclib.Types (Locator (..), renderLocator)
4646
import Text.URI (render)
47-
import Text.URI.Builder (PathComponent (..), TrailingSlash (..), setPath)
47+
import Text.URI.Builder ()
4848
import Types (GlobFilter (..), LicenseScanPathFilters (..))
4949
import Prelude hiding (unwords)
5050

@@ -137,9 +137,14 @@ runFicus ficusConfig = do
137137
let messages = parseFicusJson result Nothing
138138

139139
-- Log summary of results
140-
logDebug $ "Ficus returned " <> pretty (length $ ficusMessageErrors messages) <> " errors, "
141-
<> pretty (length $ ficusMessageDebugs messages) <> " debug messages, "
142-
<> pretty (length $ ficusMessageFindings messages) <> " findings"
140+
logDebug $
141+
"Ficus returned "
142+
<> pretty (length $ ficusMessageErrors messages)
143+
<> " errors, "
144+
<> pretty (length $ ficusMessageDebugs messages)
145+
<> " debug messages, "
146+
<> pretty (length $ ficusMessageFindings messages)
147+
<> " findings"
143148

144149
-- Handle errors - log them as warnings instead of fatal errors
145150
-- Many ficus errors are expected (like binary file detection) and shouldn't stop analysis
@@ -168,11 +173,12 @@ ficusCommand ficusConfig bin = do
168173
Just baseUri -> do
169174
pure $ render baseUri
170175
Nothing -> pure ""
171-
pure $ Command
172-
{ cmdName = toText $ toPath bin
173-
, cmdArgs = configArgs endpoint
174-
, cmdAllowErr = Never
175-
}
176+
pure $
177+
Command
178+
{ cmdName = toText $ toPath bin
179+
, cmdArgs = configArgs endpoint
180+
, cmdAllowErr = Never
181+
}
176182
where
177183
configArgs endpoint = ["analyze", "--secret", secret, "--endpoint", endpoint, "--locator", locator, "--set", "all:skip-hidden-files", "--set", "all:gitignore"] ++ configExcludes ++ [targetDir]
178184
targetDir = toText $ toFilePath $ ficusConfigRootDir ficusConfig

0 commit comments

Comments
 (0)