Skip to content

Commit

Permalink
Merge branch 'main' into renovate/major-abseil
Browse files Browse the repository at this point in the history
  • Loading branch information
cuiy0006 authored Feb 5, 2025
2 parents 8ffb2c5 + ba46f89 commit 6a93928
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
# -modernize-type-traits: clang-tidy recommands using c++17 style variable
# templates. We will enable this check after we moved to c++17.
#
# -modernize-unary-static-assert: clang-tidy asks removing empty string in
# static_assert(), the check is only applicable for c++17 and later code.
# We will enable this check after we moved to c++17.
#
# -performance-move-const-arg: This warning requires the developer to
# know/care more about the implementation details of types/functions than
# should be necessary. For example, `A a; F(std::move(a));` will trigger a
Expand Down Expand Up @@ -93,6 +97,7 @@ Checks: >
-modernize-use-nodiscard,
-modernize-avoid-c-arrays,
-modernize-type-traits,
-modernize-unary-static-assert,
-performance-move-const-arg,
-performance-avoid-endl,
-performance-enum-size,
Expand Down
9 changes: 4 additions & 5 deletions generator/internal/mixin_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ google::api::HttpRule ParseHttpRule(YAML::detail::iterator_value const& rule) {
kv.second.Type() != YAML::NodeType::Scalar)
continue;

std::string const rule_key =
absl::AsciiStrToLower(kv.first.as<std::string>());
std::string const rule_value = kv.second.as<std::string>();
auto const rule_key = absl::AsciiStrToLower(kv.first.as<std::string>());
auto const rule_value = kv.second.as<std::string>();

if (rule_key == "get") {
http_rule.set_get(rule_value);
Expand Down Expand Up @@ -107,7 +106,7 @@ std::unordered_map<std::string, google::api::HttpRule> GetMixinHttpOverrides(
auto const& selector = rule["selector"];
if (selector.Type() != YAML::NodeType::Scalar) continue;

std::string const method_full_name = selector.as<std::string>();
auto const method_full_name = selector.as<std::string>();
google::api::HttpRule http_rule = ParseHttpRule(rule);

if (rule["additional_bindings"]) {
Expand Down Expand Up @@ -150,7 +149,7 @@ std::vector<std::string> GetMixinProtoPaths(YAML::Node const& service_config) {
if (api.Type() != YAML::NodeType::Map) continue;
auto const& name = api["name"];
if (name.Type() != YAML::NodeType::Scalar) continue;
std::string const package_path = name.as<std::string>();
auto const package_path = name.as<std::string>();
auto const& mixin_proto_path_map = GetMixinProtoPathMap();
auto const it = mixin_proto_path_map.find(package_path);
if (it == mixin_proto_path_map.end()) continue;
Expand Down
1 change: 1 addition & 0 deletions google/cloud/bigtable/row_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class RowReader {
MetadataUpdatePolicy metadata_update_policy,
std::unique_ptr<internal::ReadRowsParserFactory> parser_factory);

// NOLINTNEXTLINE(performance-noexcept-move-constructor)
RowReader(RowReader&&) = default;

~RowReader() = default;
Expand Down
1 change: 1 addition & 0 deletions google/cloud/storage/async/reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class Discard : public std::enable_shared_from_this<Discard> {

} // namespace

// NOLINTNEXTLINE(bugprone-exception-escape)
AsyncReader::~AsyncReader() {
if (!impl_ || finished_) return;
impl_->Cancel();
Expand Down

0 comments on commit 6a93928

Please sign in to comment.