[libcxx] [test] Fix shadowing in string.assign and string.append

[EricWF]

LGTM.

[EricWF]

r285011.

test/std/strings/basic.string/string.modifiers/string_append/T_size_size.pass.cpp

#endif
     test_npos(S(), SV(), 0, S());
     test_npos(S(), SV(), 1, S());
     test_npos(S(), SV("12345"), 0, S("12345"));
     test_npos(S(), SV("12345"), 1, S("2345"));
     test_npos(S(), SV("12345"), 3, S("45"));
     test_npos(S(), SV("12345"), 5, S(""));
     test_npos(S(), SV("12345"), 6, S("not happening"));
     }
+
     {
-    typedef std::string S;
-    typedef std::string_view SV;
-    S s;
-    SV sv = "EFGH";
+    std::string s;
+    std::string_view sv = "EFGH";
     char arr[] = "IJKL";
 
     s.append("CDEF", 0);    // calls append(const char *, len)
     assert(s == "");
     s.clear();
 
     s.append("QRST", 0, std::string::npos); // calls append(string("QRST"), pos, npos)
     assert(s == "QRST");
     s.clear();
 
     s.append(sv, 0);  // calls append(T, pos, npos)
     assert(s == sv);
     s.clear();
-    
     s.append(sv, 0, std::string::npos);   // calls append(T, pos, npos)
     assert(s == sv);
     s.clear();
 
     s.append(arr, 0);     // calls append(const char *, len)
     assert(s == "");
     s.clear();
 
     s.append(arr, 0, std::string::npos);    // calls append(string("IJKL"), pos, npos)
     assert(s == "IJKL");
     s.clear();
 
     s.append(arr, 0);     // calls append(const char *, len)
     assert(s == "");
     s.clear();
+    }
 
     {
-    S s = "ABCD";
-    SV sv = s;
+    std::string s = "ABCD";
+    std::string_view sv = s;
     s.append(sv);
     assert(s == "ABCDABCD");
 
     sv = s;
     s.append(sv, 0, std::string::npos);
     assert(s == "ABCDABCDABCDABCD");
 
     sv = s;
     s.append(sv, sv.size());
     assert(s == "ABCDABCDABCDABCD");
     }
-    
     {
-    S s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    SV sv = s;
+    std::string s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    std::string_view sv = s;
     s.append(sv);
     assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ");
 
     sv = s;
     s.append(sv, 0, std::string::npos);
     assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ");
     }
-    }
-}

test/std/strings/basic.string/string.modifiers/string_assign/T_size_size.pass.cpp

#endif
     test_npos(S(), SV(), 0, S());
     test_npos(S(), SV(), 1, S());
     test_npos(S(), SV("12345"), 0, S("12345"));
     test_npos(S(), SV("12345"), 1, S("2345"));
     test_npos(S(), SV("12345"), 3, S("45"));
     test_npos(S(), SV("12345"), 5, S(""));
     test_npos(S(), SV("12345"), 6, S("not happening"));
     }
+
     {
-    typedef std::string S;
-    typedef std::string_view SV;
-    S s = "ABCD";
-    SV sv = "EFGH";
+    std::string s = "ABCD";
+    std::string_view sv = "EFGH";
     char arr[] = "IJKL";
 
     s.assign("CDEF", 0);    // calls assign(const char *, len)
     assert(s == "");
     s.clear();
 
     s.assign("QRST", 0, std::string::npos); // calls assign(string("QRST", pos, len)
     assert(s == "QRST");
     s.clear();
 
     s.assign(sv, 0);  // calls assign(T, pos, npos)
     assert(s == sv);
     s.clear();
-    
     s.assign(sv, 0, std::string::npos);   // calls assign(T, pos, npos)
     assert(s == sv);
     s.clear();
 
     s.assign(arr, 0);     // calls assign(const char *, len)
     assert(s == "");
     s.clear();
 
     s.assign(arr, 0, std::string::npos);    // calls assign(string("IJKL"), pos, npos)
     assert(s == "IJKL");
     s.clear();
 
     s.assign(arr, 0);     // calls assign(const char *, len)
     assert(s == "");
     s.clear();
+    }
 
     {
-    S s = "ABCD";
-    SV sv = s;
+    std::string s = "ABCD";
+    std::string_view sv = s;
     s.assign(sv);
     assert(s == "ABCD");
 
     sv = s;
     s.assign(sv, 0, std::string::npos);
     assert(s == "ABCD");
     }
-    
     {
-    S s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    SV sv = s;
+    std::string s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    std::string_view sv = s;
     s.assign(sv);
     assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
 
     sv = s;
     s.assign(sv, 0, std::string::npos);
     assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
     }
-    }
-}