averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

use new llvm::Optional API

Browse Source 
`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:
Erik Eckstein
2022-11-15 15:08:30 +01:00
parent 567b68aa6f
commit ab1b343dad
328 changed files with 1537 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Basic/FileSystem.cpp
View File

@@ -137,14 +137,14 @@ std::error_code swift::atomicallyWritingToFile(
temporaryPath = tryToOpenTemporaryFile(OS, outputPath);
if (!temporaryPath) {
assert(!OS.hasValue());
assert(!OS.has_value());
// If we failed to create the temporary, fall back to writing to the
// file directly. This handles the corner case where we cannot write to
// the directory, but can write to the file.
}
}
if (!OS.hasValue()) {
if (!OS.has_value()) {
std::error_code error;
OS.emplace(outputPath, error, fs::OF_None);
if (error) {
@@ -152,17 +152,17 @@ std::error_code swift::atomicallyWritingToFile(
}
}
action(OS.getValue());
action(OS.value());
// In addition to scoping the use of 'OS', ending the scope here also
// ensures that it's been flushed (by destroying it).
}
if (!temporaryPath.hasValue()) {
if (!temporaryPath.has_value()) {
// If we didn't use a temporary, we're done!
return std::error_code();
}
return swift::moveFileIfDifferent(temporaryPath.getValue(), outputPath);
return swift::moveFileIfDifferent(temporaryPath.value(), outputPath);
}
llvm::ErrorOr<FileDifference>