Use type names

Author: smallp-o-p

libcxx/test/std/utilities/text_encoding/text_encoding.ctor/default.pass.cpp

@@ -19,8 +19,8 @@
 #include <type_traits>
 
 constexpr bool test() {
-  constexpr auto te = std::text_encoding();
-  assert(te.mib() == std::text_encoding::id::unknown);
+  std::text_encoding te = std::text_encoding();
+  assert(te.mib() == std::text_encoding::unknown);
   assert(std::string_view("") == te.name());
 
   return true;
@@ -35,8 +35,8 @@ int main(int, char**) {
 
   // 2. Default constructing a text_encoding object makes it so that mib() == id::unknown, and its name is empty
   {
+    test();
     static_assert(test());
-    assert(test());
   }
 
   return 0;

libcxx/test/std/utilities/text_encoding/text_encoding.ctor/id.pass.cpp

@@ -20,10 +20,10 @@
 
 #include "../test_text_encoding.h"
 
-using te_id = std::text_encoding::id;
+using id = std::text_encoding::id;
 
-constexpr bool id_ctor(te_id i, te_id expect_id, std::string_view expect_name) {
-  auto te = std::text_encoding(i);
+constexpr bool id_ctor(id i, id expect_id, std::string_view expect_name) {
+  std::text_encoding te = std::text_encoding(i);
 
   assert(te.mib() == expect_id);
   assert(expect_name == te.name());
@@ -34,23 +34,24 @@ constexpr bool id_ctor(te_id i, te_id expect_id, std::string_view expect_name) {
 
 constexpr bool id_ctors() {
   for (auto pair : unique_encoding_data) {
-    assert(id_ctor(te_id(pair.mib), te_id(pair.mib), pair.name));
+    assert(id_ctor(id(pair.mib), id(pair.mib), pair.name));
   }
   return true;
 }
 
 constexpr bool test_unknown_other() {
   {
-    constexpr auto te = std::text_encoding(te_id::other);
+    std::text_encoding te = std::text_encoding(id::other);
 
-    assert(te.mib() == te_id::other);
+    assert(te.mib() == id::other);
     assert(std::string_view("") == te.name());
     assert(std::ranges::empty(te.aliases()));
   }
 
   {
-    constexpr auto te = std::text_encoding(te_id::unknown);
-    assert(te.mib() == te_id::unknown);
+    std::text_encoding te = std::text_encoding(id::unknown);
+
+    assert(te.mib() == id::unknown);
     assert(std::string_view("") == te.name());
     assert(std::ranges::empty(te.aliases()));
   }
@@ -79,8 +80,8 @@ int main(int, char**) {
   }
 
   {
+    tests();
     static_assert(tests());
-    assert(tests());
   }
 
   return 0;

libcxx/test/std/utilities/text_encoding/text_encoding.ctor/string_view.pass.cpp

@@ -22,7 +22,7 @@
 #include "../test_text_encoding.h"
 
 constexpr bool test_ctor(std::string_view str, std::string_view expect, std::text_encoding::id expect_id) {
-  auto te      = std::text_encoding(str);
+  std::text_encoding te = std::text_encoding(str);
   bool success = true;
 
   assert(te.mib() == expect_id);
@@ -33,7 +33,7 @@ constexpr bool test_ctor(std::string_view str, std::string_view expect, std::tex
 
 constexpr bool test_primary_encoding_spellings() {
   for (auto& data : unique_encoding_data) {
-    auto te = std::text_encoding(data.name);
+    std::text_encoding te = std::text_encoding(data.name);
 
     assert(te.mib() == std::text_encoding::id(data.mib));
     assert(te.name() == data.name);
@@ -43,7 +43,7 @@ constexpr bool test_primary_encoding_spellings() {
 
 constexpr bool test_others() {
   for (auto& name : other_names) {
-    auto te = std::text_encoding(name);
+    std::text_encoding te = std::text_encoding(name);
 
     assert(te.mib() == std::text_encoding::other);
     assert(te.name() == name);
@@ -95,8 +95,8 @@ int main(int, char**) {
   }
 
   {
+    tests();
     static_assert(tests());
-    assert(tests());
   }
 
   return 0;

libcxx/test/std/utilities/text_encoding/text_encoding.eq/equal.id.pass.cpp

@@ -22,7 +22,7 @@ using id = std::text_encoding::id;
 
 constexpr bool test_primary_encodings() {
   for (auto& data : unique_encoding_data) {
-    auto te = std::text_encoding(id(data.mib));
+    std::text_encoding te = std::text_encoding(id(data.mib));
     assert(te == id(data.mib));
   }
 
@@ -32,7 +32,7 @@ constexpr bool test_primary_encodings() {
 constexpr bool tests() {
   // 1. operator==(const text_encoding&, id) must be noexcept
   {
-    auto te = std::text_encoding();
+    std::text_encoding te = std::text_encoding();
     ASSERT_NOEXCEPT(te == id::UTF8);
   }
 

libcxx/test/std/utilities/text_encoding/text_encoding.eq/equal.pass.cpp

@@ -22,47 +22,46 @@ using id = std::text_encoding::id;
 constexpr bool tests() {
   // 1. operator==(const text_encoding&, const text_encoding&) must be noexcept
   {
-    constexpr auto te1 = std::text_encoding();
-    constexpr auto te2 = std::text_encoding();
+    std::text_encoding te1 = std::text_encoding();
+    std::text_encoding te2 = std::text_encoding();
     assert(te1 == te2);
     ASSERT_NOEXCEPT(te1 == te2);
   }
 
   // 2. operator==(const text_encoding&, const text_encoding&) returns true if both text_encoding ids are equal
   {
-    constexpr auto te1 = std::text_encoding(id::UTF8);
-    constexpr auto te2 = std::text_encoding(id::UTF8);
+    std::text_encoding te1 = std::text_encoding(id::UTF8);
+    std::text_encoding te2 = std::text_encoding(id::UTF8);
     assert(te1 == te2);
   }
 
   // 3. operator==(const text_encoding&, const text_encoding&) for text_encodings with ids of "other" return true if the names are equal
   {
-    constexpr auto other_te1 = std::text_encoding("foo");
-    constexpr auto other_te2 = std::text_encoding("foo");
+    std::text_encoding other_te1 = std::text_encoding("foo");
+    std::text_encoding other_te2 = std::text_encoding("foo");
     assert(other_te1 == other_te2);
   }
 
   // 4. operator==(const text_encoding&, const text_encoding&) returns false when comparingtext_encodings with different ids
   {
-    constexpr auto te1 = std::text_encoding(id::UTF8);
-    constexpr auto te2 = std::text_encoding(id::UTF16);
+    std::text_encoding te1 = std::text_encoding(id::UTF8);
+    std::text_encoding te2 = std::text_encoding(id::UTF16);
     assert(!(te1 == te2));
   }
 
   // 5. operator==(const text_encoding&, const text_encoding&) for text_encodings with ids of "other" returns false if the names are not equal
   {
-    constexpr auto other_te1 = std::text_encoding("foo");
-    constexpr auto other_te2 = std::text_encoding("bar");
+    std::text_encoding other_te1 = std::text_encoding("foo");
+    std::text_encoding other_te2 = std::text_encoding("bar");
     assert(!(other_te1 == other_te2));
   }
 
   return true;
 }
 
 int main(int, char**) {
-  {
-    static_assert(tests());
-    assert(tests());
-  }
+  tests();
+  static_assert(tests());
+
   return 0;
 }

libcxx/test/std/utilities/text_encoding/text_encoding.hash/hash.pass.cpp

@@ -22,30 +22,30 @@ bool test_te_hash() {
   using H = std::hash<T>;
 
   {
-    const T te(std::text_encoding::ASCII);
+    const T te(T::ASCII);
     const H h{};
     assert(h(te) == h(te));
     static_assert(std::is_same_v<decltype(h(te)), std::size_t>);
   }
 
   {
-    const T te1(std::text_encoding::ASCII);
-    const T te2(std::text_encoding::UTF8);
+    const T te1(T::ASCII);
+    const T te2(T::UTF8);
     const H h{};
 
     assert(h(te1) != h(te2));
   }
 
   {
-    const T te1(std::text_encoding::unknown);
-    const T te2(std::text_encoding::unknown);
+    const T te1(T::unknown);
+    const T te2(T::unknown);
     const H h{};
     assert(h(te1) == h(te2));
   }
 
   {
-    const T te1(std::text_encoding::other);
-    const T te2(std::text_encoding::other);
+    const T te1(T::other);
+    const T te2(T::other);
     const H h{};
     assert(h(te1) == h(te2));
   }
@@ -54,9 +54,7 @@ bool test_te_hash() {
 }
 
 int main(int, char**) {
-  {
-    assert(test_te_hash());
-  }
+  test_te_hash();
 
   return 0;
 }

libcxx/test/std/utilities/text_encoding/text_encoding.members/environment.pass.cpp

@@ -24,9 +24,8 @@
 #include "../test_text_encoding.h"
 #include "platform_support.h"
 
-using id = std::text_encoding::id;
 int main(int, char**) {
-  auto te = std::text_encoding::environment();
+  std::text_encoding te = std::text_encoding::environment();
   // 1. Depending on the platform's default, verify that environment() returns the corresponding text encoding.
   {
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
@@ -42,7 +41,7 @@ int main(int, char**) {
   {
     std::setlocale(LC_ALL, LOCALE_en_US_UTF_8);
 
-    auto te2 = std::text_encoding::environment();
+    std::text_encoding te2 = std::text_encoding::environment();
     assert(te2 != std::text_encoding::UTF8);
     assert(te == te2);
   }

libcxx/test/std/utilities/text_encoding/text_encoding.members/literal.pass.cpp

@@ -16,7 +16,7 @@
 #include <text_encoding>
 
 constexpr bool test() {
-  auto te = std::text_encoding::literal();
+  std::text_encoding te = std::text_encoding::literal();
 #ifdef __GNUC_EXECUTION_CHARSET_NAME
   assert(std::string_view(te.name()) == std::string_view(__GNUC_EXECUTION_CHARSET_NAME));
 #elif defined(__clang_literal_encoding__)
@@ -29,9 +29,8 @@ constexpr bool test() {
 }
 
 int main(int, char**) {
-  {
-    static_assert(test());
-    assert(test());
-  }
+  test();
+  static_assert(test());
+
   return 0;
 }

libcxx/test/std/utilities/text_encoding/text_encoding.members/nodiscard.verify.cpp

@@ -15,7 +15,7 @@
 #include <text_encoding>
 
 int main(int, char**) {
-  auto te = std::text_encoding();
+  std::text_encoding te = std::text_encoding();
   // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
   te.mib();
   // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}

libcxx/test/std/utilities/text_encoding/text_encoding.members/text_encoding.aliases_view/begin.pass.cpp

@@ -16,38 +16,37 @@
 #include <ranges>
 #include <text_encoding>
 
-using id = std::text_encoding::id;
-
 constexpr bool tests() {
   // 1. begin() of an aliases_view from a single text_encoding object are the same.
   {
-    auto te    = std::text_encoding(id::UTF8);
-    auto view1 = te.aliases();
-    auto view2 = te.aliases();
+    std::text_encoding te = std::text_encoding(std::text_encoding::UTF8);
+
+    std::text_encoding::aliases_view view1 = te.aliases();
+    std::text_encoding::aliases_view view2 = te.aliases();
 
     assert(std::ranges::begin(view1) == std::ranges::begin(view2));
     assert(view1.begin() == view2.begin());
   }
 
   // 2. begin() of aliases_views of two text_encoding objects that represent the same ID but hold different names are the same.
   {
-    auto te1 = std::text_encoding("ANSI_X3.4-1968");
-    auto te2 = std::text_encoding("ANSI_X3.4-1986");
+    std::text_encoding te1 = std::text_encoding("ANSI_X3.4-1968");
+    std::text_encoding te2 = std::text_encoding("ANSI_X3.4-1986");
 
-    auto view1 = te1.aliases();
-    auto view2 = te2.aliases();
+    std::text_encoding::aliases_view view1 = te1.aliases();
+    std::text_encoding::aliases_view view2 = te2.aliases();
 
     assert(view1.begin() == view2.begin());
     assert(std::ranges::begin(view1) == std::ranges::begin(view2));
   }
 
   // 3. begin() of aliases_views of two text_encoding objects that represent different IDs are different.
   {
-    auto te1 = std::text_encoding(id::UTF8);
-    auto te2 = std::text_encoding(id::ASCII);
+    std::text_encoding te1 = std::text_encoding(std::text_encoding::UTF8);
+    std::text_encoding te2 = std::text_encoding(std::text_encoding::ASCII);
 
-    auto view1 = te1.aliases();
-    auto view2 = te2.aliases();
+    std::text_encoding::aliases_view view1 = te1.aliases();
+    std::text_encoding::aliases_view view2 = te2.aliases();
 
     assert(!(view1.begin() == view2.begin()));
     assert(!(std::ranges::begin(view1) == std::ranges::begin(view2)));
@@ -57,9 +56,8 @@ constexpr bool tests() {
 }
 
 int main(int, char**) {
-  {
-    static_assert(tests());
-    assert(tests());
-  }
+  tests();
+  static_assert(tests());
+
   return 0;
 }