Updated some examples and documentation

Author: glynos

README.md

@@ -95,8 +95,8 @@ without using a base URL:
 #include <iostream>
 
 int main(int argc, char *argv[]) {
-  auto url = skyr::make_url("http://example.org/\xf0\x9f\x92\xa9");
-  std::cout << url.value().pathname() << std::endl;
+  auto url = skyr::url("http://example.org/\xf0\x9f\x92\xa9");
+  std::cout << url.pathname() << std::endl;
 }
 ```
 
@@ -131,12 +131,10 @@ This example parses a string, "🏳️‍🌈", using a base URL,
 #include <iostream>
 
 int main(int argc, char *argv[]) {
-  auto base = skyr::make_url("https://example.org/");
-  auto url = skyr::make_url(
-    "\xf0\x9f\x8f\xb3\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x8c\x88", base.value());
-  if (url) {
-    std::cout << url.value().href() << std::endl;
-  }
+  auto base = skyr::url("https://example.org/");
+  auto url = skyr::url(
+    "\xf0\x9f\x8f\xb3\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x8c\x88", base);
+  std::cout << url.href() << std::endl;
 }
 ```
 

examples/example_01.cpp

@@ -7,7 +7,7 @@
 #include <skyr/url.hpp>
 
 int main(int argc, char *argv[]) {
-  auto url = skyr::make_url("http://example.org/\xf0\x9f\x92\xa9");
-  std::cout << url.value() << std::endl;
-  std::cout << url.value().pathname() << std::endl;
+  auto url = skyr::url("http://example.org/\xf0\x9f\x92\xa9");
+  std::cout << url << std::endl;
+  std::cout << url.pathname() << std::endl;
 }

examples/example_03.cpp

@@ -7,10 +7,8 @@
 #include <skyr/url.hpp>
 
 int main(int argc, char *argv[]) {
-  auto base = skyr::make_url("https://example.org/");
-  auto url = skyr::make_url(
-      "\xf0\x9f\x8f\xb3\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x8c\x88", base.value());
-  if (url) {
-    std::cout << url.value() << std::endl;
-  }
+  auto base = skyr::url("https://example.org/");
+  auto url = skyr::url(
+      "\xf0\x9f\x8f\xb3\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x8c\x88", base);
+  std::cout << url << std::endl;
 }

examples/example_07.cpp

@@ -10,6 +10,7 @@
 int main(int argc, char *argv[]) {
   using namespace skyr::percent_encoding;
 
-  auto url = skyr::url("https://example.org/\xf0\x9f\x8f\xb3\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x8c\x88");
+  auto url = skyr::url(
+      "https://example.org/\xf0\x9f\x8f\xb3\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x8c\x88");
   std::cout << as<std::string>(url | view::decode).value() << std::endl;
 }

examples/example_09.cpp

@@ -8,6 +8,7 @@
 
 int main(int argc, char *argv[]) {
   auto url = skyr::url("https://example.org/");
-  url.search_parameters().append("q", "\xf0\x9f\x8f\xb3\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x8c\x88");
+  url.search_parameters().append(
+      "q", "\xf0\x9f\x8f\xb3\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x8c\x88");
   std::cout << url << std::endl;
 }

include/skyr/url.hpp

@@ -54,10 +54,10 @@ class url_parse_error : public std::runtime_error {
 ///
 /// For example:
 /// ```
-/// auto url = skyr::make_url("http://example.org/");
-/// assert("http:" == url.value().scheme());
-/// assert("example.org" == url.value().hostname());
-/// assert("/" == url.value().pathname());
+/// auto url = skyr::url("http://example.org/");
+/// assert("http:" == url.scheme());
+/// assert("example.org" == url.hostname());
+/// assert("/" == url.pathname());
 /// ```
 class url {
 
@@ -83,7 +83,7 @@ class url {
   /// Constructs an empty `url` object
   ///
   /// \post `empty() == true`
-  url();
+  url() : url_(), href_(), view_(href_), parameters_(this) {}
 
   /// Parses a URL from the input string. The input string can be
   /// any unicode encoded string (UTF-8, UTF-16 or UTF-32).
@@ -131,19 +131,19 @@ class url {
   /// Constructs a URL from an existing record
   ///
   /// \param input A URL record
-  explicit url(url_record &&input);
+  explicit url(url_record &&input)
+  : url() {
+    update_record(std::forward<url_record>(input));
+  }
 
   ///
   /// \param other
   url(const url &other)
-  : url() {
-    auto other_url = other.url_;
-    update_record(std::move(other_url));
-  }
+  : url(url_record(other.url_)) {}
 
   ///
   /// \param other
-  url(url &&other)
+  url(url &&other) noexcept
   : url(std::move(other.url_)) {}
 
   /// Swaps this `url` object with another

src/url/url.cpp

@@ -13,17 +13,6 @@
 #include "url_schemes.hpp"
 
 namespace skyr {
-url::url()
-  : url_()
-  , href_()
-  , view_(href_)
-  , parameters_(this) {}
-
-url::url(url_record &&input)
-  : url() {
-  update_record(std::forward<url_record>(input));
-}
-
 void url::swap(url &other) noexcept {
   using std::swap;
   swap(url_, other.url_);