mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
use new llvm::Optional API
`getValue` -> `value` `getValueOr` -> `value_or` `hasValue` -> `has_value` `map` -> `transform` The old API will be deprecated in the rebranch. To avoid merge conflicts, use the new API already in the main branch. rdar://102362022
This commit is contained in:
@@ -124,8 +124,8 @@ bool ExplicitModuleInterfaceBuilder::collectDepsForSerialization(
|
||||
|
||||
// Serialize the paths of dependencies in the SDK relative to it.
|
||||
Optional<StringRef> SDKRelativePath = getRelativeDepPath(DepName, SDKPath);
|
||||
StringRef DepNameToStore = SDKRelativePath.getValueOr(DepName);
|
||||
bool IsSDKRelative = SDKRelativePath.hasValue();
|
||||
StringRef DepNameToStore = SDKRelativePath.value_or(DepName);
|
||||
bool IsSDKRelative = SDKRelativePath.has_value();
|
||||
|
||||
// Forwarding modules add the underlying prebuilt module to their
|
||||
// dependency list -- don't serialize that.
|
||||
|
||||
Reference in New Issue
Block a user