builders don't borrow self

Author: jhendrixMSFT

sdk/core/typespec_client_core/src/http/mod.rs

@@ -151,7 +151,7 @@ impl<'a> QueryBuilder<'a> {
     ///
     /// This is useful for boolean flags or markers in query strings that don't require a value.
     ///
-    /// Returns `&mut Self` to allow chaining multiple calls.
+    /// Returns `Self` to allow chaining multiple calls.
     ///
     /// # Examples
     ///
@@ -165,7 +165,7 @@ impl<'a> QueryBuilder<'a> {
     ///     .build();
     /// assert_eq!(url.as_str(), "https://contoso.com/?debug&a=1");
     /// ```
-    pub fn append_key_only(&mut self, key: impl Into<std::borrow::Cow<'a, str>>) -> &mut Self {
+    pub fn append_key_only(mut self, key: impl Into<std::borrow::Cow<'a, str>>) -> Self {
         let key = key.into();
 
         if let Some((_, vals)) = self.values.iter_mut().find(|(k, _)| k == &key) {
@@ -186,7 +186,7 @@ impl<'a> QueryBuilder<'a> {
     /// `&'a str`, `String`, and `Cow<'a, str>`. This avoids unnecessary allocations when using
     /// string literals.
     ///
-    /// Returns `&mut Self` to allow chaining multiple calls.
+    /// Returns `Self` to allow chaining multiple calls.
     ///
     /// # Examples
     ///
@@ -201,10 +201,10 @@ impl<'a> QueryBuilder<'a> {
     /// assert_eq!(url.as_str(), "https://contoso.com/?a=1&a=2&b=3");
     /// ```
     pub fn append_pair(
-        &mut self,
+        mut self,
         key: impl Into<std::borrow::Cow<'a, str>>,
         value: impl Into<std::borrow::Cow<'a, str>>,
-    ) -> &mut Self {
+    ) -> Self {
         let key = key.into();
         let value = value.into();
 
@@ -227,7 +227,7 @@ impl<'a> QueryBuilder<'a> {
     /// `&'a str`, `String`, and `Cow<'a, str>`. This avoids unnecessary allocations when using
     /// string literals.
     ///
-    /// Returns `&mut Self` to allow chaining multiple calls.
+    /// Returns `Self` to allow chaining multiple calls.
     ///
     /// # Examples
     ///
@@ -242,10 +242,10 @@ impl<'a> QueryBuilder<'a> {
     /// assert_eq!(url.as_str(), "https://contoso.com/?a=new_value&b=2&c=3");
     /// ```
     pub fn set_pair(
-        &mut self,
+        mut self,
         key: impl Into<std::borrow::Cow<'a, str>>,
         value: impl Into<std::borrow::Cow<'a, str>>,
-    ) -> &mut Self {
+    ) -> Self {
         let key = key.into();
         let value = value.into();
 
@@ -415,87 +415,74 @@ mod test {
     #[test]
     fn test_query_builder_empty_query() {
         let mut url = Url::parse("https://contoso.com").unwrap();
-        let mut builder = url.query_builder();
-        builder.set_pair("a", "1");
-        builder.build();
+        url.query_builder().set_pair("a", "1").build();
         assert_eq!(url.as_str(), "https://contoso.com/?a=1");
     }
 
     #[test]
     fn test_query_builder_new_parameter() {
         let mut url = Url::parse("https://contoso.com?b=2").unwrap();
-        let mut builder = url.query_builder();
-        builder.set_pair("a", "1");
-        builder.build();
+        url.query_builder().set_pair("a", "1").build();
         assert_eq!(url.as_str(), "https://contoso.com/?b=2&a=1");
     }
 
     #[test]
     fn test_query_builder_overwrite_existing() {
         let mut url = Url::parse("https://contoso.com?a=1&b=2").unwrap();
-        let mut builder = url.query_builder();
-        builder.set_pair("a", "new_value");
-        builder.build();
+        url.query_builder().set_pair("a", "new_value").build();
         assert_eq!(url.as_str(), "https://contoso.com/?a=new_value&b=2");
     }
 
     #[test]
     fn test_query_builder_overwrite_duplicate() {
         let mut url = Url::parse("https://contoso.com?a=1&b=2&a=3").unwrap();
-        let mut builder = url.query_builder();
-        builder.set_pair("a", "new_value");
-        builder.build();
+        url.query_builder().set_pair("a", "new_value").build();
         assert_eq!(url.as_str(), "https://contoso.com/?a=new_value&b=2");
     }
 
     #[test]
     fn test_query_builder_preserves_order() {
         let mut url = Url::parse("https://contoso.com?x=1&a=old&y=2&z=3").unwrap();
-        let mut builder = url.query_builder();
-        builder.set_pair("a", "new");
-        builder.build();
+        url.query_builder().set_pair("a", "new").build();
         assert_eq!(url.as_str(), "https://contoso.com/?x=1&a=new&y=2&z=3");
     }
 
     #[test]
     fn test_query_builder_with_special_chars() {
         let mut url = Url::parse("https://contoso.com?a=old").unwrap();
-        let mut builder = url.query_builder();
-        builder.set_pair("a", "hello world");
-        builder.build();
+        url.query_builder().set_pair("a", "hello world").build();
         assert_eq!(url.as_str(), "https://contoso.com/?a=hello+world");
     }
 
     #[test]
     fn test_query_builder_multiple_sets() {
         let mut url = Url::parse("https://contoso.com?a=1&b=2").unwrap();
-        let mut builder = url.query_builder();
-        builder
+        url.query_builder()
             .set_pair("a", "new")
             .set_pair("c", "3")
-            .set_pair("b", "updated");
-        builder.build();
+            .set_pair("b", "updated")
+            .build();
         assert_eq!(url.as_str(), "https://contoso.com/?a=new&b=updated&c=3");
     }
 
     #[test]
     fn test_query_builder_with_numeric_value() {
         let mut url = Url::parse("https://contoso.com").unwrap();
-        let mut builder = url.query_builder();
-        builder.set_pair("foo", 1.to_string()).set_pair("bar", "2");
-        builder.build();
+        url.query_builder()
+            .set_pair("foo", 1.to_string())
+            .set_pair("bar", "2")
+            .build();
         assert_eq!(url.as_str(), "https://contoso.com/?foo=1&bar=2");
     }
 
     #[test]
     fn test_query_builder_append_key_only() {
         let mut url = Url::parse("https://contoso.com").unwrap();
-        let mut builder = url.query_builder();
-        builder
+        url.query_builder()
             .append_key_only("debug")
             .append_pair("a", "1")
-            .append_key_only("verbose");
-        builder.build();
+            .append_key_only("verbose")
+            .build();
         assert_eq!(url.as_str(), "https://contoso.com/?debug&a=1&verbose");
     }
 }