toString uses nodiscard am: a7dadbe2d3 am: 2afe9bf259

Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/1701974

Change-Id: I716ff8d65603a34d21bf746d3322747426c5e022

17 files changed, 20 insertions, 20 deletions

diff --git a/generate_cpp.cpp b/generate_cpp.cpp
index 8f104758..fcc27b69 100644
--- a/generate_cpp.cpp
+++ b/generate_cpp.cpp
@@ -1338,10 +1338,10 @@ std::unique_ptr<Document> BuildParcelSource(const AidlTypenames& typenames, cons
 std::string GenerateEnumToString(const AidlTypenames& typenames,
                                  const AidlEnumDeclaration& enum_decl) {
   std::ostringstream code;
-  const std::string signature =
-      "static inline std::string toString(" + enum_decl.GetName() + " val)";
+  code << "[[nodiscard]]";
   GenerateDeprecated(code, enum_decl);
-  code << signature << " {\n";
+  code << " static inline std::string toString(" << enum_decl.GetName() << " val)";
+  code << " {\n";
   code << "  switch(val) {\n";
   std::set<std::string> unique_cases;
   for (const auto& enumerator : enum_decl.GetEnumerators()) {
diff --git a/generate_ndk.cpp b/generate_ndk.cpp
index 9076c86e..c87c5c63 100644
--- a/generate_ndk.cpp
+++ b/generate_ndk.cpp
@@ -1271,7 +1271,7 @@ std::string GenerateEnumToString(const AidlTypenames& typenames,
                                  const AidlEnumDeclaration& enum_decl) {
   std::ostringstream code;
   const std::string signature =
-      "static inline std::string toString(" + enum_decl.GetName() + " val)";
+      "[[nodiscard]] static inline std::string toString(" + enum_decl.GetName() + " val)";
   if (enum_decl.IsDeprecated()) {
     code << signature;
     cpp::GenerateDeprecated(code, enum_decl);
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/BackendType.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/BackendType.h
index 79d27b89..a87dc2e5 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/BackendType.h
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/BackendType.h
@@ -18,7 +18,7 @@ enum class BackendType : int8_t {
   RUST = 3,
 };
 
-static inline std::string toString(BackendType val) {
+[[nodiscard]] static inline std::string toString(BackendType val) {
   switch(val) {
   case BackendType::CPP:
     return "CPP";
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ByteEnum.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ByteEnum.h
index 41e39577..7b500102 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ByteEnum.h
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ByteEnum.h
@@ -17,7 +17,7 @@ enum class ByteEnum : int8_t {
   BAZ = 3,
 };
 
-static inline std::string toString(ByteEnum val) {
+[[nodiscard]] static inline std::string toString(ByteEnum val) {
   switch(val) {
   case ByteEnum::FOO:
     return "FOO";
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ConstantExpressionEnum.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ConstantExpressionEnum.h
index af8f983e..b9abcb30 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ConstantExpressionEnum.h
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/ConstantExpressionEnum.h
@@ -24,7 +24,7 @@ enum class ConstantExpressionEnum : int32_t {
   hexInt64_1 = 1,
 };
 
-static inline std::string toString(ConstantExpressionEnum val) {
+[[nodiscard]] static inline std::string toString(ConstantExpressionEnum val) {
   switch(val) {
   case ConstantExpressionEnum::decInt32_1:
     return "decInt32_1";
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/DeprecatedEnum.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/DeprecatedEnum.h
index 3f3e84d0..8de53cf6 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/DeprecatedEnum.h
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/DeprecatedEnum.h
@@ -17,7 +17,7 @@ enum class __attribute__((deprecated("test"))) DeprecatedEnum : int32_t {
   C = 2,
 };
 
- __attribute__((deprecated("test")))static inline std::string toString(DeprecatedEnum val) {
+[[nodiscard]] __attribute__((deprecated("test"))) static inline std::string toString(DeprecatedEnum val) {
   switch(val) {
   case DeprecatedEnum::A:
     return "A";
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IntEnum.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IntEnum.h
index e8f9a19f..50b1b60c 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IntEnum.h
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/IntEnum.h
@@ -17,7 +17,7 @@ enum class IntEnum : int32_t {
   BAZ = 2001,
 };
 
-static inline std::string toString(IntEnum val) {
+[[nodiscard]] static inline std::string toString(IntEnum val) {
   switch(val) {
   case IntEnum::FOO:
     return "FOO";
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/LongEnum.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/LongEnum.h
index bd353992..8caa3aa2 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/LongEnum.h
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/LongEnum.h
@@ -17,7 +17,7 @@ enum class LongEnum : int64_t {
   BAZ = 200000000001L,
 };
 
-static inline std::string toString(LongEnum val) {
+[[nodiscard]] static inline std::string toString(LongEnum val) {
   switch(val) {
   case LongEnum::FOO:
     return "FOO";
diff --git a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/BackendType.h b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/BackendType.h
index 8f482c5c..6838ca77 100644
--- a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/BackendType.h
+++ b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/BackendType.h
@@ -21,7 +21,7 @@ enum class BackendType : int8_t {
   RUST = 3,
 };
 
-static inline std::string toString(BackendType val) {
+[[nodiscard]] static inline std::string toString(BackendType val) {
   switch(val) {
   case BackendType::CPP:
     return "CPP";
diff --git a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/ByteEnum.h b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/ByteEnum.h
index d29f50c5..30ac9e5c 100644
--- a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/ByteEnum.h
+++ b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/ByteEnum.h
@@ -20,7 +20,7 @@ enum class ByteEnum : int8_t {
   BAZ = 3,
 };
 
-static inline std::string toString(ByteEnum val) {
+[[nodiscard]] static inline std::string toString(ByteEnum val) {
   switch(val) {
   case ByteEnum::FOO:
     return "FOO";
diff --git a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/ConstantExpressionEnum.h b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/ConstantExpressionEnum.h
index c3ce4bec..1802d847 100644
--- a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/ConstantExpressionEnum.h
+++ b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/ConstantExpressionEnum.h
@@ -27,7 +27,7 @@ enum class ConstantExpressionEnum : int32_t {
   hexInt64_1 = 1,
 };
 
-static inline std::string toString(ConstantExpressionEnum val) {
+[[nodiscard]] static inline std::string toString(ConstantExpressionEnum val) {
   switch(val) {
   case ConstantExpressionEnum::decInt32_1:
     return "decInt32_1";
diff --git a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/DeprecatedEnum.h b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/DeprecatedEnum.h
index 052e5db7..853c808d 100644
--- a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/DeprecatedEnum.h
+++ b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/DeprecatedEnum.h
@@ -20,8 +20,8 @@ enum class __attribute__((deprecated("test"))) DeprecatedEnum : int32_t {
   C = 2,
 };
 
-static inline std::string toString(DeprecatedEnum val) __attribute__((deprecated("test")));
-static inline std::string toString(DeprecatedEnum val) {
+[[nodiscard]] static inline std::string toString(DeprecatedEnum val) __attribute__((deprecated("test")));
+[[nodiscard]] static inline std::string toString(DeprecatedEnum val) {
   switch(val) {
   case DeprecatedEnum::A:
     return "A";
diff --git a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/IntEnum.h b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/IntEnum.h
index fcb0b99a..b5f9ac94 100644
--- a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/IntEnum.h
+++ b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/IntEnum.h
@@ -20,7 +20,7 @@ enum class IntEnum : int32_t {
   BAZ = 2001,
 };
 
-static inline std::string toString(IntEnum val) {
+[[nodiscard]] static inline std::string toString(IntEnum val) {
   switch(val) {
   case IntEnum::FOO:
     return "FOO";
diff --git a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/LongEnum.h b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/LongEnum.h
index b43062d4..5081c89e 100644
--- a/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/LongEnum.h
+++ b/tests/golden_output/aidl-test-interface-ndk_platform-source/gen/include/aidl/android/aidl/tests/LongEnum.h
@@ -20,7 +20,7 @@ enum class LongEnum : int64_t {
   BAZ = 200000000001L,
 };
 
-static inline std::string toString(LongEnum val) {
+[[nodiscard]] static inline std::string toString(LongEnum val) {
   switch(val) {
   case LongEnum::FOO:
     return "FOO";
diff --git a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Enum.h b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Enum.h
index 0b97075b..7b5982b0 100644
--- a/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Enum.h
+++ b/tests/golden_output/aidl_test_loggable_interface-cpp-source/gen/include/android/aidl/loggable/Enum.h
@@ -15,7 +15,7 @@ enum class Enum : int8_t {
   FOO = 42,
 };
 
-static inline std::string toString(Enum val) {
+[[nodiscard]] static inline std::string toString(Enum val) {
   switch(val) {
   case Enum::FOO:
     return "FOO";
diff --git a/tests/golden_output/aidl_test_loggable_interface-ndk-source/gen/include/aidl/android/aidl/loggable/Enum.h b/tests/golden_output/aidl_test_loggable_interface-ndk-source/gen/include/aidl/android/aidl/loggable/Enum.h
index 09594607..1f020806 100644
--- a/tests/golden_output/aidl_test_loggable_interface-ndk-source/gen/include/aidl/android/aidl/loggable/Enum.h
+++ b/tests/golden_output/aidl_test_loggable_interface-ndk-source/gen/include/aidl/android/aidl/loggable/Enum.h
@@ -18,7 +18,7 @@ enum class Enum : int8_t {
   FOO = 42,
 };
 
-static inline std::string toString(Enum val) {
+[[nodiscard]] static inline std::string toString(Enum val) {
   switch(val) {
   case Enum::FOO:
     return "FOO";
diff --git a/tests/golden_output/aidl_test_loggable_interface-ndk_platform-source/gen/include/aidl/android/aidl/loggable/Enum.h b/tests/golden_output/aidl_test_loggable_interface-ndk_platform-source/gen/include/aidl/android/aidl/loggable/Enum.h
index 09594607..1f020806 100644
--- a/tests/golden_output/aidl_test_loggable_interface-ndk_platform-source/gen/include/aidl/android/aidl/loggable/Enum.h
+++ b/tests/golden_output/aidl_test_loggable_interface-ndk_platform-source/gen/include/aidl/android/aidl/loggable/Enum.h
@@ -18,7 +18,7 @@ enum class Enum : int8_t {
   FOO = 42,
 };
 
-static inline std::string toString(Enum val) {
+[[nodiscard]] static inline std::string toString(Enum val) {
   switch(val) {
   case Enum::FOO:
     return "FOO";