diff options
author | Jordan Bayles <jophba@chromium.org> | 2020-12-02 13:23:59 -0800 |
---|---|---|
committer | Jordan Bayles <jophba@chromium.org> | 2020-12-07 19:16:30 +0000 |
commit | 963b0a6bd9156b612efc8c0d8142bba7b5f4e1dc (patch) | |
tree | fbb8e7e41233888db4526e36e867445319737202 /discovery/mdns | |
parent | b9d9529da93acf08f70acf2071f153749c4eac94 (diff) | |
download | openscreen-963b0a6bd9156b612efc8c0d8142bba7b5f4e1dc.tar.gz |
Add presubmit check for unnecessary is_value checks
This patch removes all unnecessary ErrorOr<>::is_value() checks and adds a
presubmit handler for them.
Change-Id: I2d1382113c00a5ba578dd23f5a15eae79d75c307
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2569369
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Diffstat (limited to 'discovery/mdns')
-rw-r--r-- | discovery/mdns/mdns_records.cc | 1 | ||||
-rw-r--r-- | discovery/mdns/mdns_records.h | 21 |
2 files changed, 10 insertions, 12 deletions
diff --git a/discovery/mdns/mdns_records.cc b/discovery/mdns/mdns_records.cc index 6eed677b..9923d2c4 100644 --- a/discovery/mdns/mdns_records.cc +++ b/discovery/mdns/mdns_records.cc @@ -363,7 +363,6 @@ TxtRecordRdata::TxtRecordRdata() = default; TxtRecordRdata::TxtRecordRdata(std::vector<Entry> texts) { ErrorOr<TxtRecordRdata> rdata = TxtRecordRdata::TryCreate(std::move(texts)); - OSP_DCHECK(rdata.is_value()); *this = std::move(rdata.value()); } diff --git a/discovery/mdns/mdns_records.h b/discovery/mdns/mdns_records.h index 9212b519..de37932c 100644 --- a/discovery/mdns/mdns_records.h +++ b/discovery/mdns/mdns_records.h @@ -57,14 +57,13 @@ class DomainName { template <typename IteratorType> DomainName(IteratorType first, IteratorType last) { ErrorOr<DomainName> domain = TryCreate(first, last); - OSP_DCHECK(domain.is_value()); *this = std::move(domain.value()); } explicit DomainName(std::vector<std::string> labels); explicit DomainName(const std::vector<absl::string_view>& labels); explicit DomainName(std::initializer_list<absl::string_view> labels); DomainName(const DomainName& other); - DomainName(DomainName&& other); + DomainName(DomainName&& other) noexcept; DomainName& operator=(const DomainName& rhs); DomainName& operator=(DomainName&& rhs); @@ -114,7 +113,7 @@ class RawRecordRdata { explicit RawRecordRdata(std::vector<uint8_t> rdata); RawRecordRdata(const uint8_t* begin, size_t size); RawRecordRdata(const RawRecordRdata& other); - RawRecordRdata(RawRecordRdata&& other); + RawRecordRdata(RawRecordRdata&& other) noexcept; RawRecordRdata& operator=(const RawRecordRdata& rhs); RawRecordRdata& operator=(RawRecordRdata&& rhs); @@ -147,7 +146,7 @@ class SrvRecordRdata { uint16_t port, DomainName target); SrvRecordRdata(const SrvRecordRdata& other); - SrvRecordRdata(SrvRecordRdata&& other); + SrvRecordRdata(SrvRecordRdata&& other) noexcept; SrvRecordRdata& operator=(const SrvRecordRdata& rhs); SrvRecordRdata& operator=(SrvRecordRdata&& rhs); @@ -181,7 +180,7 @@ class ARecordRdata { explicit ARecordRdata(IPAddress ipv4_address, NetworkInterfaceIndex interface_index = 0); ARecordRdata(const ARecordRdata& other); - ARecordRdata(ARecordRdata&& other); + ARecordRdata(ARecordRdata&& other) noexcept; ARecordRdata& operator=(const ARecordRdata& rhs); ARecordRdata& operator=(ARecordRdata&& rhs); @@ -211,7 +210,7 @@ class AAAARecordRdata { explicit AAAARecordRdata(IPAddress ipv6_address, NetworkInterfaceIndex interface_index = 0); AAAARecordRdata(const AAAARecordRdata& other); - AAAARecordRdata(AAAARecordRdata&& other); + AAAARecordRdata(AAAARecordRdata&& other) noexcept; AAAARecordRdata& operator=(const AAAARecordRdata& rhs); AAAARecordRdata& operator=(AAAARecordRdata&& rhs); @@ -241,7 +240,7 @@ class PtrRecordRdata { PtrRecordRdata(); explicit PtrRecordRdata(DomainName ptr_domain); PtrRecordRdata(const PtrRecordRdata& other); - PtrRecordRdata(PtrRecordRdata&& other); + PtrRecordRdata(PtrRecordRdata&& other) noexcept; PtrRecordRdata& operator=(const PtrRecordRdata& rhs); PtrRecordRdata& operator=(PtrRecordRdata&& rhs); @@ -275,7 +274,7 @@ class TxtRecordRdata { TxtRecordRdata(); explicit TxtRecordRdata(std::vector<Entry> texts); TxtRecordRdata(const TxtRecordRdata& other); - TxtRecordRdata(TxtRecordRdata&& other); + TxtRecordRdata(TxtRecordRdata&& other) noexcept; TxtRecordRdata& operator=(const TxtRecordRdata& rhs); TxtRecordRdata& operator=(TxtRecordRdata&& rhs); @@ -336,7 +335,7 @@ class NsecRecordRdata { std::vector<DnsType>{types...}) {} NsecRecordRdata(DomainName next_domain_name, std::vector<DnsType> types); NsecRecordRdata(const NsecRecordRdata& other); - NsecRecordRdata(NsecRecordRdata&& other); + NsecRecordRdata(NsecRecordRdata&& other) noexcept; NsecRecordRdata& operator=(const NsecRecordRdata& rhs); NsecRecordRdata& operator=(NsecRecordRdata&& rhs); @@ -400,7 +399,7 @@ class OptRecordRdata { : OptRecordRdata(std::vector<Option>{std::move(types)...}) {} explicit OptRecordRdata(std::vector<Option> options); OptRecordRdata(const OptRecordRdata& other); - OptRecordRdata(OptRecordRdata&& other); + OptRecordRdata(OptRecordRdata&& other) noexcept; OptRecordRdata& operator=(const OptRecordRdata& rhs); OptRecordRdata& operator=(OptRecordRdata&& rhs); @@ -465,7 +464,7 @@ class MdnsRecord { std::chrono::seconds ttl, Rdata rdata); MdnsRecord(const MdnsRecord& other); - MdnsRecord(MdnsRecord&& other); + MdnsRecord(MdnsRecord&& other) noexcept; MdnsRecord& operator=(const MdnsRecord& rhs); MdnsRecord& operator=(MdnsRecord&& rhs); |