Remove x_ prefix from new trait methods

allenap · Jul 7, 2024 · 5be6c18 · 5be6c18
1 parent 2b76555
commit 5be6c18
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/bash.rs b/src/bash.rs
@@ -72,20 +72,20 @@ pub struct Bash;
 // ----------------------------------------------------------------------------
 
 impl QuoteInto<Vec<u8>> for Bash {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut Vec<u8>) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut Vec<u8>) {
         Self::quote_into_vec(s, out);
     }
 }
 
 impl QuoteInto<String> for Bash {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut String) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut String) {
         Self::quote_into_vec(s, unsafe { out.as_mut_vec() })
     }
 }
 
 #[cfg(unix)]
 impl QuoteInto<std::ffi::OsString> for Bash {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut std::ffi::OsString) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut std::ffi::OsString) {
         use std::os::unix::ffi::OsStringExt;
         let s = Self::quote_vec(s);
         let s = std::ffi::OsString::from_vec(s);
@@ -95,7 +95,7 @@ impl QuoteInto<std::ffi::OsString> for Bash {
 
 #[cfg(feature = "bstr")]
 impl QuoteInto<bstr::BString> for Bash {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut bstr::BString) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut bstr::BString) {
         let s = Self::quote_vec(s);
         out.extend(s);
     }

diff --git a/src/fish.rs b/src/fish.rs
@@ -24,20 +24,20 @@ use crate::{ascii::Char, util::u8_to_hex_escape_uppercase_x, Quotable, QuoteInto
 pub struct Fish;
 
 impl QuoteInto<Vec<u8>> for Fish {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut Vec<u8>) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut Vec<u8>) {
         Self::quote_into_vec(s, out);
     }
 }
 
 impl QuoteInto<String> for Fish {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut String) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut String) {
         Self::quote_into_vec(s, unsafe { out.as_mut_vec() })
     }
 }
 
 #[cfg(unix)]
 impl QuoteInto<std::ffi::OsString> for Fish {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut std::ffi::OsString) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut std::ffi::OsString) {
         use std::os::unix::ffi::OsStringExt;
         let s = Self::quote_vec(s);
         let s = std::ffi::OsString::from_vec(s);
@@ -47,7 +47,7 @@ impl QuoteInto<std::ffi::OsString> for Fish {
 
 #[cfg(feature = "bstr")]
 impl QuoteInto<bstr::BString> for Fish {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut bstr::BString) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut bstr::BString) {
         let s = Self::quote_vec(s);
         out.extend(s);
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -39,15 +39,15 @@ pub type Zsh = bash::Bash;
 /// Quoting/escaping a string of bytes into a shell-safe form.
 pub trait QuoteInto<OUT: ?Sized> {
     /// Quote/escape a string of bytes into an existing container.
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut OUT);
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut OUT);
 }
 
 /// Quoting/escaping a string of bytes into a shell-safe form.
 pub trait Quote<OUT: Default>: QuoteInto<OUT> {
     /// Quote/escape a string of bytes into a new container.
-    fn x_quote<'q, S: ?Sized + Into<Quotable<'q>>>(s: S) -> OUT {
+    fn quote<'q, S: ?Sized + Into<Quotable<'q>>>(s: S) -> OUT {
         let mut out = OUT::default();
-        Self::x_quote_into(s, &mut out);
+        Self::quote_into(s, &mut out);
         out
     }
 }
@@ -73,7 +73,7 @@ impl<T: ?Sized> QuoteExt for T {
         Q: QuoteInto<Self>,
         S: ?Sized + Into<Quotable<'q>>,
     {
-        Q::x_quote_into(s, self);
+        Q::quote_into(s, self);
     }
 }
 
@@ -92,7 +92,7 @@ where
     S: ?Sized + Into<Quotable<'a>>,
 {
     fn quoted<Q: Quote<OUT>>(self, _q: Q) -> OUT {
-        Q::x_quote(self)
+        Q::quote(self)
     }
 }
 

diff --git a/src/sh.rs b/src/sh.rs
@@ -81,14 +81,14 @@ use crate::{ascii::Char, Quotable, QuoteInto};
 pub struct Sh;
 
 impl QuoteInto<Vec<u8>> for Sh {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut Vec<u8>) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut Vec<u8>) {
         Self::quote_into_vec(s, out);
     }
 }
 
 #[cfg(unix)]
 impl QuoteInto<std::ffi::OsString> for Sh {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut std::ffi::OsString) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut std::ffi::OsString) {
         use std::os::unix::ffi::OsStringExt;
         let s = Self::quote_vec(s);
         let s = std::ffi::OsString::from_vec(s);
@@ -98,7 +98,7 @@ impl QuoteInto<std::ffi::OsString> for Sh {
 
 #[cfg(feature = "bstr")]
 impl QuoteInto<bstr::BString> for Sh {
-    fn x_quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut bstr::BString) {
+    fn quote_into<'q, S: ?Sized + Into<Quotable<'q>>>(s: S, out: &mut bstr::BString) {
         let s = Self::quote_vec(s);
         out.extend(s);
     }