From 84c6d200b6e62970e7d4dba0f73324871c22bd6d Mon Sep 17 00:00:00 2001 From: JP Simard Date: Fri, 27 Jan 2023 16:31:56 -0500 Subject: [PATCH] Clean up unused initializers (#4726) Found with the upcoming improve dead code detection. --- .../Extensions/Configuration+FileGraph.swift | 8 ---- .../Helpers/LintableFilesVisitor.swift | 39 ++++++------------- 2 files changed, 11 insertions(+), 36 deletions(-) diff --git a/Source/SwiftLintFramework/Extensions/Configuration+FileGraph.swift b/Source/SwiftLintFramework/Extensions/Configuration+FileGraph.swift index 358554891..a5d5f418c 100644 --- a/Source/SwiftLintFramework/Extensions/Configuration+FileGraph.swift +++ b/Source/SwiftLintFramework/Extensions/Configuration+FileGraph.swift @@ -28,14 +28,6 @@ public extension Configuration { self.ignoreParentAndChildConfigs = ignoreParentAndChildConfigs } - internal init(config: String, rootDirectory: String, ignoreParentAndChildConfigs: Bool) throws { - self.init( - commandLineChildConfigs: [config], - rootDirectory: rootDirectory, - ignoreParentAndChildConfigs: ignoreParentAndChildConfigs - ) - } - /// Dummy init to get a FileGraph that just represents a root directory internal init(rootDirectory: String) { self.init( diff --git a/Source/swiftlint/Helpers/LintableFilesVisitor.swift b/Source/swiftlint/Helpers/LintableFilesVisitor.swift index cad419507..6f625ac71 100644 --- a/Source/swiftlint/Helpers/LintableFilesVisitor.swift +++ b/Source/swiftlint/Helpers/LintableFilesVisitor.swift @@ -83,25 +83,6 @@ struct LintableFilesVisitor { let mode: LintOrAnalyzeModeWithCompilerArguments let block: (CollectedLinter) async -> Void - init(paths: [String], action: String, useSTDIN: Bool, - quiet: Bool, showProgressBar: Bool, useScriptInputFiles: Bool, forceExclude: Bool, useExcludingByPrefix: Bool, - cache: LinterCache?, parallel: Bool, - allowZeroLintableFiles: Bool, block: @escaping (CollectedLinter) async -> Void) { - self.paths = resolveParamsFiles(args: paths) - self.action = action - self.useSTDIN = useSTDIN - self.quiet = quiet - self.showProgressBar = showProgressBar - self.useScriptInputFiles = useScriptInputFiles - self.forceExclude = forceExclude - self.useExcludingByPrefix = useExcludingByPrefix - self.cache = cache - self.parallel = parallel - self.mode = .lint - self.allowZeroLintableFiles = allowZeroLintableFiles - self.block = block - } - private init(paths: [String], action: String, useSTDIN: Bool, quiet: Bool, showProgressBar: Bool, useScriptInputFiles: Bool, forceExclude: Bool, useExcludingByPrefix: Bool, cache: LinterCache?, compilerInvocations: CompilerInvocations?, @@ -142,15 +123,17 @@ struct LintableFilesVisitor { compilerInvocations = try loadCompilerInvocations(options) } - return Self(paths: options.paths, action: options.verb.bridge().capitalized, - useSTDIN: options.useSTDIN, quiet: options.quiet, - showProgressBar: options.progress, - useScriptInputFiles: options.useScriptInputFiles, - forceExclude: options.forceExclude, - useExcludingByPrefix: options.useExcludingByPrefix, - cache: cache, - compilerInvocations: compilerInvocations, - allowZeroLintableFiles: allowZeroLintableFiles, block: block) + return LintableFilesVisitor( + paths: options.paths, action: options.verb.bridge().capitalized, + useSTDIN: options.useSTDIN, quiet: options.quiet, + showProgressBar: options.progress, + useScriptInputFiles: options.useScriptInputFiles, + forceExclude: options.forceExclude, + useExcludingByPrefix: options.useExcludingByPrefix, + cache: cache, + compilerInvocations: compilerInvocations, + allowZeroLintableFiles: allowZeroLintableFiles, block: block + ) } }