Move to extension

Author: keith

Sources/Commands/Options.swift

@@ -90,6 +90,27 @@ enum BuildSystemKind: String, ExpressibleByArgument, CaseIterable {
     case xcode
 }
 
+public extension Sanitizer {
+    init(argument: String) throws {
+        if let sanitizer = Sanitizer(rawValue: argument) {
+            self = sanitizer
+            return
+        }
+
+        for sanitizer in Sanitizer.allCases where sanitizer.shortName == argument {
+            self = sanitizer
+            return
+        }
+
+        throw ArgumentConversionError.custom("valid sanitizers: \(Sanitizer.formattedValues)")
+    }
+
+    /// All sanitizer options in a comma separated string
+    fileprivate static var formattedValues: String {
+        return Sanitizer.allCases.map(\.rawValue).joined(separator: ", ")
+    }
+}
+
 public struct SwiftToolOptions: ParsableArguments {
     @OptionGroup()
     var buildFlagsGroup: BuildFlagsGroup

Sources/SPMBuildCore/Sanitizers.swift

@@ -18,25 +18,6 @@ public enum Sanitizer: String, Encodable, CaseIterable {
     case undefined
     case scudo
 
-    public init(argument: String) throws {
-        if let sanitizer = Sanitizer(rawValue: argument) {
-            self = sanitizer
-            return
-        }
-
-        for sanitizer in Sanitizer.allCases where sanitizer.shortName == argument {
-            self = sanitizer
-            return
-        }
-
-        throw ArgumentConversionError.custom("valid sanitizers: \(Sanitizer.formattedValues)")
-    }
-
-    /// All sanitizer options in a comma separated string
-    public static var formattedValues: String {
-        return Sanitizer.allCases.map(\.rawValue).joined(separator: ", ")
-    }
-
     /// Return an established short name for a sanitizer, e.g. "asan".
     public var shortName: String {
         switch self {