refactor

- make clearer where percent encoding is used.
- add more generalised tests for user.name kind of user names.

Author: Byron

gix-url/src/lib.rs

@@ -328,39 +328,6 @@ impl Url {
     }
 }
 
-/// Characters that must be percent-encoded in the userinfo component of a URL.
-///
-/// According to RFC 3986, userinfo can contain:
-/// - unreserved characters: `A-Z a-z 0-9 - . _ ~`
-/// - percent-encoded characters
-/// - sub-delims: `! $ & ' ( ) * + , ; =`
-/// - `:`
-///
-/// This encode set encodes everything else, particularly `@` (userinfo delimiter),
-/// `/` `?` `#` (path/query/fragment delimiters), and various other special characters.
-const USERINFO_ENCODE_SET: &percent_encoding::AsciiSet = &percent_encoding::CONTROLS
-    .add(b' ')
-    .add(b'"')
-    .add(b'#')
-    .add(b'%')
-    .add(b'/')
-    .add(b'<')
-    .add(b'>')
-    .add(b'?')
-    .add(b'@')
-    .add(b'[')
-    .add(b'\\')
-    .add(b']')
-    .add(b'^')
-    .add(b'`')
-    .add(b'{')
-    .add(b'|')
-    .add(b'}');
-
-fn percent_encode(s: &str) -> Cow<'_, str> {
-    percent_encoding::utf8_percent_encode(s, USERINFO_ENCODE_SET).into()
-}
-
 /// Serialization
 impl Url {
     /// Write this URL losslessly to `out`, ready to be parsed again.
@@ -379,6 +346,38 @@ impl Url {
     }
 
     fn write_canonical_form_to(&self, out: &mut dyn std::io::Write) -> std::io::Result<()> {
+        fn percent_encode(s: &str) -> Cow<'_, str> {
+            /// Characters that must be percent-encoded in the userinfo component of a URL.
+            ///
+            /// According to RFC 3986, userinfo can contain:
+            /// - unreserved characters: `A-Z a-z 0-9 - . _ ~`
+            /// - percent-encoded characters
+            /// - sub-delims: `! $ & ' ( ) * + , ; =`
+            /// - `:`
+            ///
+            /// This encode-set encodes everything else, particularly `@` (userinfo delimiter),
+            /// `/` `?` `#` (path/query/fragment delimiters), and various other special characters.
+            const USERINFO_ENCODE_SET: &percent_encoding::AsciiSet = &percent_encoding::CONTROLS
+                .add(b' ')
+                .add(b'"')
+                .add(b'#')
+                .add(b'%')
+                .add(b'/')
+                .add(b'<')
+                .add(b'>')
+                .add(b'?')
+                .add(b'@')
+                .add(b'[')
+                .add(b'\\')
+                .add(b']')
+                .add(b'^')
+                .add(b'`')
+                .add(b'{')
+                .add(b'|')
+                .add(b'}');
+            percent_encoding::utf8_percent_encode(s, USERINFO_ENCODE_SET).into()
+        }
+
         out.write_all(self.scheme.as_str().as_bytes())?;
         out.write_all(b"://")?;
         match (&self.user, &self.host) {

gix-url/tests/fixtures/make_baseline.sh

@@ -15,7 +15,7 @@ tests_windows=()
 for path in "repo" "re:po" "re/po"; do
   # normal urls
   for protocol in "ssh+git" "git+ssh" "git" "ssh"; do
-    for host in "host" "user@host" "user_name@host" "user@[::1]" "user@::1"; do
+    for host in "host" "user@host" "user_name@host" "user.name@host" "user@[::1]" "user@::1"; do
       for port_separator in "" ":"; do
         tests+=("$protocol://$host$port_separator/$path")
 
@@ -52,12 +52,6 @@ done
 tests_windows+=("file://c:/repo")
 tests_windows+=("c:repo")
 
-# Test URLs with dots in usernames (gitbutler issue #11419)
-# Dots should not be percent-encoded in userinfo
-tests+=("ssh://user.name@host/repo")
-tests+=("git://user.name@host/repo")
-tests+=("user.name@host:repo")
-
 tests_unix+=("${tests[@]}")
 tests_windows+=("${tests[@]}")
 

gix-url/tests/url/baseline.rs

@@ -84,7 +84,7 @@ fn run() {
     }
 
     assert!(
-        failure_count_reserialization <= 63,
+        failure_count_reserialization <= 72,
         "the number of reserialization errors should ideally get better, not worse - if this panic is not due to regressions but to new passing test cases, you can set this check to {failure_count_reserialization}"
     );
     assert_eq!(failure_count_roundtrips, 0, "there should be no roundtrip errors");
@@ -185,8 +185,8 @@ mod baseline {
 
         pub fn max_num_failures(&self) -> usize {
             match self {
-                Kind::Unix => 195,
-                Kind::Windows => 195 + 6,
+                Kind::Unix => 222,
+                Kind::Windows => 222 + 6,
             }
         }