From 5d510d530657b4198a3e15717950be2cba8e91ed Mon Sep 17 00:00:00 2001 From: Alexey Demin Date: Tue, 24 Dec 2024 01:44:02 -0800 Subject: [PATCH] Rename options to cases. Fix path to cases. --- README.md | 30 ++--- Sources/EnumOptionSetClient/main.swift | 8 +- .../EnumOptionSetMacro.swift | 42 +++--- .../EnumOptionSetTests.swift | 120 +++++++++--------- 4 files changed, 100 insertions(+), 100 deletions(-) diff --git a/README.md b/README.md index 8a88f73..83efc23 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ enum ShippingOption { ``` > [!NOTE] > The macro generates a nested `Set` structure that conforms to the `OptionSet` protocol, using `Int` as the default raw value type and extracting options from the names of enum cases in the order of declaration.\ -> It also generates the `all` property as an option composition, along with some other helper members. +> It also generates the `all` property as an option composition, along with some other helper structure members. Then you can create a typealias, and extend the option set with additional composite options: ```Swift @@ -37,17 +37,17 @@ extension ShippingOptions { ## Advanced usage The macro also supports custom raw value types and indices: ```Swift -@EnumOptionSet // OptionSet.RawValue = Int8 +@EnumOptionSet // OptionSet.RawValue = UInt8 enum ShippingOption: Int { - case nextDay // Starting with index 0. (rawValue: 1 << 0) - case secondDay // Incrementing by 1. (rawValue: 1 << 1) - case priority = 3 // Skipping index 2. (rawValue: 1 << 3) - case standard // Continuing to increment. (rawValue: 1 << 4) + case nextDay // Starting with index 0. (rawValue: 1 << 0) + case secondDay // Incrementing by 1. (rawValue: 1 << 1) + case priority = 3 // Skipping index 2. (rawValue: 1 << 3) + case standard // Continuing to increment. (rawValue: 1 << 4) } ``` > [!TIP] -> The `OptionSet.RawValue` type can also be declared as the macro's first argument `@EnumOptionSet(Int8.self)`.\ -> Currently, an even shorter form `@EnumOptionSet(Int8)` works, but this may be a bug of the Swift syntax analyzer, so use it at your own risk. +> The `OptionSet.RawValue` type can also be declared as the macro's first argument `@EnumOptionSet(UInt8.self)`.\ +> Currently, an even shorter form `@EnumOptionSet(UInt8)` works, but this may be a bug of the Swift syntax analyzer, so use it at your own risk. > [!NOTE] > Enum raw values that are expressed in ways other than integer literals, as well as associated values, are ignored.\ @@ -58,9 +58,9 @@ Specifically, it performs checks for duplicate indices and raw value overflow. A Both of checks can be disabled with the `checkOverflow` attribute flag: ```Swift -@EnumOptionSet(checkOverflow: false) +@EnumOptionSet(checkOverflow: false) enum ShippingOption: Int { - case nextDay, secondDay, priority, standard = 8 // Option bit index 8 is out of range for 'Int8'. + case nextDay, secondDay, priority, standard = 8 // Option bit index 8 is out of range for 'UInt8'. } ``` > [!NOTE] @@ -76,13 +76,13 @@ ShippingOptions.express.debugDescription // "OptionSet(0b00000011)" ``` The `CustomStringConvertible` and `CustomDebugStringConvertible` protocol conformance can be disabled by setting the `generateDescription` attribute flag to `false`. -### Options -The `OptionSet` maintains a connection to the enum cases through the `options` property and initializer. +### Cases +The `OptionSet` maintains a connection to the enum through the `cases` property and initializer. ```Swift -let shippingOptions = ShippingOptions(options: [.secondDay, .priority]) -shippingOptions.options // [ShippingOption.secondDay, ShippingOption.priority] +let shippingOptions = ShippingOptions(cases: [.secondDay, .priority]) +shippingOptions.cases // [ShippingOption.secondDay, ShippingOption.priority] ``` -These are not generated for enums with associated values. +These structure members are not generated for enums with associated values. ### Subscript The macro contains an `OptionSet` extension for accessing options as boolean flags using subscript notation: diff --git a/Sources/EnumOptionSetClient/main.swift b/Sources/EnumOptionSetClient/main.swift index d7e8462..2375847 100644 --- a/Sources/EnumOptionSetClient/main.swift +++ b/Sources/EnumOptionSetClient/main.swift @@ -12,7 +12,7 @@ import EnumOptionSet //struct ShippingOptions: OptionSet { -// let rawValue: Int +// let rawValue: UInt8 // // static let nextDay = Self(rawValue: 1 << 0) // static let secondDay = Self(rawValue: 1 << 1) @@ -23,7 +23,7 @@ import EnumOptionSet // static let all: Self = [.express, .priority, .standard] //} -@EnumOptionSet +@EnumOptionSet enum ShippingOption: Int { case nextDay, secondDay, priority = 3, standard } @@ -41,5 +41,5 @@ assert(shippingOptions == [.express, .priority, .standard]) shippingOptions[.express].toggle() assert(shippingOptions == [.priority, .standard]) -shippingOptions = .init(options: [.secondDay, .priority]) -assert(shippingOptions.options == [.secondDay, .priority]) +shippingOptions = .init(cases: [.secondDay, .priority]) +assert(shippingOptions.cases == [.secondDay, .priority]) diff --git a/Sources/EnumOptionSetMacros/EnumOptionSetMacro.swift b/Sources/EnumOptionSetMacros/EnumOptionSetMacro.swift index 2e7bd77..4ef73b4 100644 --- a/Sources/EnumOptionSetMacros/EnumOptionSetMacro.swift +++ b/Sources/EnumOptionSetMacros/EnumOptionSetMacro.swift @@ -195,10 +195,10 @@ public struct EnumOptionSetMacro: MemberMacro { """ // Generates static constants for set options. - let members = try enumeratedElementNames.map { index, name in - var member = try VariableDeclSyntax("\(accessModifier)static let \(raw: name) = Self(bitIndex: \(raw: index))") - member.leadingTrivia = "/// `\(enumeration.name.text).\(optionSetStructName)(rawValue: 1 << \(index))`\n" - return member + let options = try enumeratedElementNames.map { index, name in + var option = try VariableDeclSyntax("\(accessModifier)static let \(raw: name) = Self(bitIndex: \(raw: index))") + option.leadingTrivia = "/// `\(enumeration.name.text).\(optionSetStructName)(rawValue: 1 << \(index))` option.\n" + return option } // Generates a static constant for the combination of all set options if the name is not already used in one of the options. @@ -258,32 +258,32 @@ public struct EnumOptionSetMacro: MemberMacro { } } - var options: VariableDeclSyntax? - var initOptions: InitializerDeclSyntax? + var cases: VariableDeclSyntax? + var initCases: InitializerDeclSyntax? if !hasAssociatedValues { // Generates a computed property returning an array of enum cases corresponding to the bit mask. - options = try VariableDeclSyntax("\(accessModifier)var options: [\(enumeration.name.trimmed)]") { """ - [\(raw: caseElements.map { "(Self.\($0.name.text), ShippingOption.\($0.name.text))" }.joined(separator: ", "))].reduce(into: []) { result, option in - if contains(option.0) { - result.append(option.1) + cases = try VariableDeclSyntax("\(accessModifier)var cases: [\(enumeration.name.trimmed)]") { """ + [\(raw: caseElements.map { "(Self.\($0.name.text), \(enumeration.name.text).\($0.name.text))" }.joined(separator: ", "))].reduce(into: []) { result, element in + if contains(element.0) { + result.append(element.1) } } """ } - options?.leadingTrivia = "/// Array of `\(enumeration.name.text)` enum cases in the `rawValue` bit mask, ordered by declaration.\n" + cases?.leadingTrivia = "/// Array of `\(enumeration.name.text)` enum cases in the `rawValue` bit mask, ordered by declaration.\n" - // Generates an initializer with `options`. - initOptions = try InitializerDeclSyntax("\(accessModifier)init(options: [\(enumeration.name.trimmed)])") { """ - self = [\(raw: caseElements.map { "(Self.\($0.name.text), ShippingOption.\($0.name.text))" }.joined(separator: ", "))].reduce(into: []) { result, option in - if options.contains(option.1) { - result.formUnion(option.0) + // Generates an initializer with `cases`. + initCases = try InitializerDeclSyntax("\(accessModifier)init(cases: [\(enumeration.name.trimmed)])") { """ + self = [\(raw: caseElements.map { "(Self.\($0.name.text), \(enumeration.name.text).\($0.name.text))" }.joined(separator: ", "))].reduce(into: []) { result, element in + if cases.contains(element.1) { + result.formUnion(element.0) } } """ } - initOptions?.leadingTrivia = """ + initCases?.leadingTrivia = """ /// Creates a new option set with the specified array of `\(enumeration.name.text)` enum cases. - /// - Parameter options: The array of `\(enumeration.name.text)` enum cases corresponding to the `rawValue` bit mask.\n + /// - Parameter cases: The array of `\(enumeration.name.text)` enum cases corresponding to the `rawValue` bit mask.\n """ } @@ -292,14 +292,14 @@ public struct EnumOptionSetMacro: MemberMacro { rawValue initRawValue initBitIndex - members + options if let combination { combination } bitIndices initBitIndices if let description { description } if let debugDescription { debugDescription } - if let options { options } - if let initOptions { initOptions } + if let cases { cases } + if let initCases { initCases } } return [.init(setStructure)] diff --git a/Tests/EnumOptionSetTests/EnumOptionSetTests.swift b/Tests/EnumOptionSetTests/EnumOptionSetTests.swift index 2d517ab..4f800a8 100644 --- a/Tests/EnumOptionSetTests/EnumOptionSetTests.swift +++ b/Tests/EnumOptionSetTests/EnumOptionSetTests.swift @@ -39,14 +39,14 @@ func rawValueExpandedSource(_ type: String) -> String { """ } -let defaultMembersExpandedSource = """ - /// `ShippingOption.Set(rawValue: 1 << 0)` +let defaultOptionsExpandedSource = """ + /// `ShippingOption.Set(rawValue: 1 << 0)` option. static let nextDay = Self(bitIndex: 0) - /// `ShippingOption.Set(rawValue: 1 << 1)` + /// `ShippingOption.Set(rawValue: 1 << 1)` option. static let secondDay = Self(bitIndex: 1) - /// `ShippingOption.Set(rawValue: 1 << 2)` + /// `ShippingOption.Set(rawValue: 1 << 2)` option. static let priority = Self(bitIndex: 2) - /// `ShippingOption.Set(rawValue: 1 << 3)` + /// `ShippingOption.Set(rawValue: 1 << 3)` option. static let standard = Self(bitIndex: 3) """ @@ -87,22 +87,22 @@ func descriptionExpandedSource(_ names: String) -> String { """ } -func optionsExpandedSource(_ options: String) -> String { +func casesExpandedSource(_ elements: String) -> String { """ /// Array of `ShippingOption` enum cases in the `rawValue` bit mask, ordered by declaration. - var options: [ShippingOption] { - \(options).reduce(into: []) { result, option in - if contains(option.0) { - result.append(option.1) + var cases: [ShippingOption] { + \(elements).reduce(into: []) { result, element in + if contains(element.0) { + result.append(element.1) } } } /// Creates a new option set with the specified array of `ShippingOption` enum cases. - /// - Parameter options: The array of `ShippingOption` enum cases corresponding to the `rawValue` bit mask. - init(options: [ShippingOption]) { - self = \(options).reduce(into: []) { result, option in - if options.contains(option.1) { - result.formUnion(option.0) + /// - Parameter cases: The array of `ShippingOption` enum cases corresponding to the `rawValue` bit mask. + init(cases: [ShippingOption]) { + self = \(elements).reduce(into: []) { result, element in + if cases.contains(element.1) { + result.formUnion(element.0) } } } @@ -112,11 +112,11 @@ func optionsExpandedSource(_ options: String) -> String { let defaultSetStructExpandedSource = """ struct Set: OptionSet, CustomStringConvertible, CustomDebugStringConvertible { \(rawValueExpandedSource("Int")) - \(defaultMembersExpandedSource) + \(defaultOptionsExpandedSource) \(defaultCombinationExpandedSource) \(bitIndicesExpandedSource) \(descriptionExpandedSource(#"[0: "nextDay", 1: "secondDay", 2: "priority", 3: "standard"]"#)) - \(optionsExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) + \(casesExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) } """ @@ -135,13 +135,13 @@ let publicEnumExpandedSource = #""" assert((0 ..< RawValue.bitWidth).contains(bitIndex), "Option bit index \(bitIndex) is out of range for 'UInt8'") self.init(rawValue: 1 << bitIndex) } - /// `ShippingOption.Set(rawValue: 1 << 0)` + /// `ShippingOption.Set(rawValue: 1 << 0)` option. public static let nextDay = Self(bitIndex: 0) - /// `ShippingOption.Set(rawValue: 1 << 1)` + /// `ShippingOption.Set(rawValue: 1 << 1)` option. public static let secondDay = Self(bitIndex: 1) - /// `ShippingOption.Set(rawValue: 1 << 2)` + /// `ShippingOption.Set(rawValue: 1 << 2)` option. public static let priority = Self(bitIndex: 2) - /// `ShippingOption.Set(rawValue: 1 << 3)` + /// `ShippingOption.Set(rawValue: 1 << 3)` option. public static let standard = Self(bitIndex: 3) /// Combination of all set options. public static let all: Self = [nextDay, secondDay, priority, standard] @@ -170,19 +170,19 @@ let publicEnumExpandedSource = #""" "OptionSet(\(rawValue.binaryString))" } /// Array of `ShippingOption` enum cases in the `rawValue` bit mask, ordered by declaration. - public var options: [ShippingOption] { - [(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)].reduce(into: []) { result, option in - if contains(option.0) { - result.append(option.1) + public var cases: [ShippingOption] { + [(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)].reduce(into: []) { result, element in + if contains(element.0) { + result.append(element.1) } } } /// Creates a new option set with the specified array of `ShippingOption` enum cases. - /// - Parameter options: The array of `ShippingOption` enum cases corresponding to the `rawValue` bit mask. - public init(options: [ShippingOption]) { - self = [(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)].reduce(into: []) { result, option in - if options.contains(option.1) { - result.formUnion(option.0) + /// - Parameter cases: The array of `ShippingOption` enum cases corresponding to the `rawValue` bit mask. + public init(cases: [ShippingOption]) { + self = [(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)].reduce(into: []) { result, element in + if cases.contains(element.1) { + result.formUnion(element.0) } } } @@ -207,7 +207,7 @@ final class EnumOptionSetTests: XCTestCase { struct Set: OptionSet, CustomStringConvertible, CustomDebugStringConvertible { \(rawValueExpandedSource("Int")) - \(defaultMembersExpandedSource) + \(defaultOptionsExpandedSource) \(defaultCombinationExpandedSource) \(bitIndicesExpandedSource) \(descriptionExpandedSource(#"[0: "nextDay", 1: "secondDay", 2: "priority", 3: "standard"]"#)) @@ -265,18 +265,18 @@ final class EnumOptionSetTests: XCTestCase { struct Set: OptionSet, CustomStringConvertible, CustomDebugStringConvertible { \(rawValueExpandedSource("Int")) - /// `ShippingOption.Set(rawValue: 1 << 0)` + /// `ShippingOption.Set(rawValue: 1 << 0)` option. static let nextDay = Self(bitIndex: 0) - /// `ShippingOption.Set(rawValue: 1 << 1)` + /// `ShippingOption.Set(rawValue: 1 << 1)` option. static let secondDay = Self(bitIndex: 1) - /// `ShippingOption.Set(rawValue: 1 << 3)` + /// `ShippingOption.Set(rawValue: 1 << 3)` option. static let priority = Self(bitIndex: 3) - /// `ShippingOption.Set(rawValue: 1 << 4)` + /// `ShippingOption.Set(rawValue: 1 << 4)` option. static let standard = Self(bitIndex: 4) \(defaultCombinationExpandedSource) \(bitIndicesExpandedSource) \(descriptionExpandedSource(#"[0: "nextDay", 1: "secondDay", 3: "priority", 4: "standard"]"#)) - \(optionsExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) + \(casesExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) } } """, @@ -359,12 +359,12 @@ final class EnumOptionSetTests: XCTestCase { struct Set: OptionSet, CustomStringConvertible, CustomDebugStringConvertible { \(rawValueExpandedSource("Int")) - \(defaultMembersExpandedSource) - /// `ShippingOption.Set(rawValue: 1 << 4)` + \(defaultOptionsExpandedSource) + /// `ShippingOption.Set(rawValue: 1 << 4)` option. static let all = Self(bitIndex: 4) \(bitIndicesExpandedSource) \(descriptionExpandedSource(#"[0: "nextDay", 1: "secondDay", 2: "priority", 3: "standard", 4: "all"]"#)) - \(optionsExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard), (Self.all, ShippingOption.all)]")) + \(casesExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard), (Self.all, ShippingOption.all)]")) } } """, @@ -395,12 +395,12 @@ final class EnumOptionSetTests: XCTestCase { struct Set: OptionSet, CustomStringConvertible, CustomDebugStringConvertible { \(rawValueExpandedSource("Int")) - \(defaultMembersExpandedSource) - /// `ShippingOption.Set(rawValue: 1 << 4)` + \(defaultOptionsExpandedSource) + /// `ShippingOption.Set(rawValue: 1 << 4)` option. static let `all` = Self(bitIndex: 4) \(bitIndicesExpandedSource) \(descriptionExpandedSource(#"[0: "nextDay", 1: "secondDay", 2: "priority", 3: "standard", 4: "`all`"]"#)) - \(optionsExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard), (Self.`all`, ShippingOption.`all`)]")) + \(casesExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard), (Self.`all`, ShippingOption.`all`)]")) } } """, @@ -426,18 +426,18 @@ final class EnumOptionSetTests: XCTestCase { struct Set: OptionSet, CustomStringConvertible, CustomDebugStringConvertible { \(rawValueExpandedSource("UInt8")) - /// `ShippingOption.Set(rawValue: 1 << 0)` + /// `ShippingOption.Set(rawValue: 1 << 0)` option. static let nextDay = Self(bitIndex: 0) - /// `ShippingOption.Set(rawValue: 1 << 1)` + /// `ShippingOption.Set(rawValue: 1 << 1)` option. static let secondDay = Self(bitIndex: 1) - /// `ShippingOption.Set(rawValue: 1 << 7)` + /// `ShippingOption.Set(rawValue: 1 << 7)` option. static let priority = Self(bitIndex: 7) - /// `ShippingOption.Set(rawValue: 1 << 8)` + /// `ShippingOption.Set(rawValue: 1 << 8)` option. static let standard = Self(bitIndex: 8) \(defaultCombinationExpandedSource) \(bitIndicesExpandedSource) \(descriptionExpandedSource(#"[0: "nextDay", 1: "secondDay", 7: "priority", 8: "standard"]"#)) - \(optionsExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) + \(casesExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) } } """, @@ -468,18 +468,18 @@ final class EnumOptionSetTests: XCTestCase { struct Set: OptionSet, CustomStringConvertible, CustomDebugStringConvertible { \(rawValueExpandedSource("Int")) - /// `ShippingOption.Set(rawValue: 1 << 0)` + /// `ShippingOption.Set(rawValue: 1 << 0)` option. static let nextDay = Self(bitIndex: 0) - /// `ShippingOption.Set(rawValue: 1 << 1)` + /// `ShippingOption.Set(rawValue: 1 << 1)` option. static let secondDay = Self(bitIndex: 1) - /// `ShippingOption.Set(rawValue: 1 << 63)` + /// `ShippingOption.Set(rawValue: 1 << 63)` option. static let priority = Self(bitIndex: 63) - /// `ShippingOption.Set(rawValue: 1 << 64)` + /// `ShippingOption.Set(rawValue: 1 << 64)` option. static let standard = Self(bitIndex: 64) \(defaultCombinationExpandedSource) \(bitIndicesExpandedSource) \(descriptionExpandedSource(#"[0: "nextDay", 1: "secondDay", 63: "priority", 64: "standard"]"#)) - \(optionsExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) + \(casesExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) } } """, @@ -518,13 +518,13 @@ final class EnumOptionSetTests: XCTestCase { init(bitIndex: Int) { self.init(rawValue: 1 << bitIndex) } - /// `ShippingOption.Set(rawValue: 1 << 0)` + /// `ShippingOption.Set(rawValue: 1 << 0)` option. static let nextDay = Self(bitIndex: 0) - /// `ShippingOption.Set(rawValue: 1 << 1)` + /// `ShippingOption.Set(rawValue: 1 << 1)` option. static let secondDay = Self(bitIndex: 1) - /// `ShippingOption.Set(rawValue: 1 << 63)` + /// `ShippingOption.Set(rawValue: 1 << 63)` option. static let priority = Self(bitIndex: 63) - /// `ShippingOption.Set(rawValue: 1 << 64)` + /// `ShippingOption.Set(rawValue: 1 << 64)` option. static let standard = Self(bitIndex: 64) \(defaultCombinationExpandedSource) /// Set of indices corresponding to the `1` bits in the `rawValue` bit mask. @@ -543,7 +543,7 @@ final class EnumOptionSetTests: XCTestCase { } } \(descriptionExpandedSource(#"[0: "nextDay", 1: "secondDay", 63: "priority", 64: "standard"]"#)) - \(optionsExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) + \(casesExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) } } """, @@ -569,10 +569,10 @@ final class EnumOptionSetTests: XCTestCase { struct Set: OptionSet { \(rawValueExpandedSource("Int")) - \(defaultMembersExpandedSource) + \(defaultOptionsExpandedSource) \(defaultCombinationExpandedSource) \(bitIndicesExpandedSource) - \(optionsExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) + \(casesExpandedSource("[(Self.nextDay, ShippingOption.nextDay), (Self.secondDay, ShippingOption.secondDay), (Self.priority, ShippingOption.priority), (Self.standard, ShippingOption.standard)]")) } } """, @@ -651,7 +651,7 @@ final class EnumOptionSetTests: XCTestCase { static let all: Self = [] \(bitIndicesExpandedSource) \(descriptionExpandedSource("[]")) - \(optionsExpandedSource("[]")) + \(casesExpandedSource("[]")) } } """,