Corrected the 'swap' test

 - this worked because string_view had broken equality

Author: os12

src/uri.cpp

@@ -166,13 +166,13 @@ void uri::initialize(optional<string_type> scheme,
   }
 }
 
-uri::uri() : uri_view_(uri_), uri_parts_() {}
+uri::uri() : uri_view_(uri_) {}
 
-uri::uri(const uri &other) : uri_(other.uri_), uri_view_(uri_), uri_parts_() {
+uri::uri(const uri &other) : uri_(other.uri_), uri_view_(uri_) {
   detail::advance_parts(uri_view_, uri_parts_, other.uri_parts_);
 }
 
-uri::uri(const uri_builder &builder) : uri_parts_() {
+uri::uri(const uri_builder &builder) {
   initialize(builder.scheme_, builder.user_info_, builder.host_, builder.port_,
              builder.path_, builder.query_, builder.fragment_);
 }
@@ -194,11 +194,12 @@ uri &uri::operator=(uri other) {
 }
 
 void uri::swap(uri &other) noexcept {
-  auto parts = uri_parts_;
-  advance_parts(other.uri_view_, uri_parts_, other.uri_parts_);
   uri_.swap(other.uri_);
   uri_view_.swap(other.uri_view_);
-  advance_parts(other.uri_view_, other.uri_parts_, parts);
+
+  const auto this_parts = uri_parts_;
+  detail::advance_parts(uri_view_, uri_parts_, other.uri_parts_);
+  detail::advance_parts(other.uri_view_, other.uri_parts_, this_parts);
 }
 
 uri::const_iterator uri::begin() const noexcept { return uri_view_.begin(); }

test/uri_test.cpp

@@ -444,7 +444,7 @@ TEST(uri_test, swap_test) {
   ASSERT_TRUE(original.has_path());
   EXPECT_EQ("file", original.scheme());
   EXPECT_EQ("", original.host());
-  EXPECT_EQ("/something/different", original.path());
+  EXPECT_EQ("/something/different/", original.path());
 
   ASSERT_TRUE(instance.has_scheme());
   ASSERT_TRUE(instance.has_host());