Rename {absl => std}::optional in //components/
#cleanup
Automated patch. This is a no-op. Please avoid, to assign unrelated
bugs to this, as much as possible.
Context:
https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email
As of https://crrev.com/1204351, absl::optional is now a type alias
for std::optional. We should migrate toward it.
Script:
```
function replace {
echo "Replacing $1 by $2"
git grep -l "$1" \
| cut -f1 -d: \
| grep \
-e "^components/" \
| grep \
-e "\.h" \
-e "\.cc" \
-e "\.mm" \
| grep -v \
-e "components/cast_streaming/browser/public/receiver_config.*" \
-e "components/power_metrics/*" \
-e "components/zucchini/patch_reader.*" \
| sort \
| uniq \
| xargs sed -i "s/$1/$2/g"
}
replace "absl::make_optional" "std::make_optional"
replace "absl::optional" "std::optional"
replace "absl::nullopt" "std::nullopt"
replace "absl::in_place" "std::in_place"
replace "absl::in_place_t" "std::in_place_t"
replace "\"third_party\/abseil-cpp\/absl\/types\/optional.h\"" "<optional>"
echo "Formatting:"
echo "IncludeBlocks: Regroup" >> ".clang-format"
echo "IncludeIsMainRegex: \"(_(android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?(_(unit|browser|perf)?tests?)?$\"" >> ".clang-format"
git cl format
git restore ".clang-format"
git cl format
```
Bug: chromium:1500249
Change-Id: I34b45aba082a627d94fd9d3f9f994a60c64b40b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5200092
Auto-Submit: Arthur Sonzogni <[email protected]>
Reviewed-by: danakj <[email protected]>
Commit-Queue: danakj <[email protected]>
Owners-Override: danakj <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1252820}
diff --git a/components/zucchini/reloc_win32.cc b/components/zucchini/reloc_win32.cc
index bebb5035..f9b957f 100644
--- a/components/zucchini/reloc_win32.cc
+++ b/components/zucchini/reloc_win32.cc
@@ -94,14 +94,14 @@
RelocRvaReaderWin32::~RelocRvaReaderWin32() = default;
// Unrolls a nested loop: outer = reloc blocks and inner = reloc entries.
-absl::optional<RelocUnitWin32> RelocRvaReaderWin32::GetNext() {
+std::optional<RelocUnitWin32> RelocRvaReaderWin32::GetNext() {
// "Outer loop" to find non-empty reloc block.
while (cur_reloc_units_.Remaining() < kRelocUnitSize) {
if (!LoadRelocBlock(cur_reloc_units_.end()))
- return absl::nullopt;
+ return std::nullopt;
}
if (end_it_ - cur_reloc_units_.begin() < kRelocUnitSize)
- return absl::nullopt;
+ return std::nullopt;
// "Inner loop" to extract single reloc unit.
offset_t location =
base::checked_cast<offset_t>(cur_reloc_units_.begin() - image_.begin());
@@ -109,7 +109,7 @@
uint8_t type = static_cast<uint8_t>(entry >> 12);
rva_t rva = rva_hi_bits_ + (entry & 0xFFF);
if (!cur_reloc_units_.Skip(kRelocUnitSize)) {
- return absl::nullopt;
+ return std::nullopt;
}
return RelocUnitWin32{type, location, rva};
}
@@ -147,8 +147,8 @@
RelocReaderWin32::~RelocReaderWin32() = default;
// ReferenceReader:
-absl::optional<Reference> RelocReaderWin32::GetNext() {
- for (absl::optional<RelocUnitWin32> unit = reloc_rva_reader_.GetNext();
+std::optional<Reference> RelocReaderWin32::GetNext() {
+ for (std::optional<RelocUnitWin32> unit = reloc_rva_reader_.GetNext();
unit.has_value(); unit = reloc_rva_reader_.GetNext()) {
if (unit->type != reloc_type_)
continue;
@@ -161,7 +161,7 @@
offset_t location = unit->location;
return Reference{location, target};
}
- return absl::nullopt;
+ return std::nullopt;
}
/******** RelocWriterWin32 ********/
