diff options
author | Florian Klink <flokli@flokli.de> | 2023-08-01T10·21+0200 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-08-19T10·54+0000 |
commit | 39efe50311e459a2011d0abd4d06e1147ca38509 (patch) | |
tree | f17c5d1669e367f3463af61c0f5bacef22243495 /tvix/nix-compat/src/derivation/escape.rs | |
parent | 72fc4fee534c2b28016dd004671b11bebc1b8c68 (diff) |
refactor(tvix/nix-compat/derivation/escape): move to Vec<u8> r/6487
We only need bstr::ByteSlice to be able to use replace, it doesn't need to return a BString. Change-Id: I811948436fb89652e880970c2c05356183f3e439 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9084 Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de> Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/nix-compat/src/derivation/escape.rs')
-rw-r--r-- | tvix/nix-compat/src/derivation/escape.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tvix/nix-compat/src/derivation/escape.rs b/tvix/nix-compat/src/derivation/escape.rs index 8c2c6fce0753..06b550bbf02d 100644 --- a/tvix/nix-compat/src/derivation/escape.rs +++ b/tvix/nix-compat/src/derivation/escape.rs @@ -1,7 +1,7 @@ -use bstr::{BString, ByteSlice}; +use bstr::ByteSlice; /// Escapes a byte sequence. Does not add surrounding quotes. -pub fn escape_bstr<P: AsRef<[u8]>>(s: P) -> BString { +pub fn escape_bytes<P: AsRef<[u8]>>(s: P) -> Vec<u8> { let mut s: Vec<u8> = s.as_ref().to_vec(); s = s.replace(b"\\", b"\\\\"); @@ -10,18 +10,18 @@ pub fn escape_bstr<P: AsRef<[u8]>>(s: P) -> BString { s = s.replace(b"\t", b"\\t"); s = s.replace(b"\"", b"\\\""); - s.into() + s } #[cfg(test)] mod tests { - use super::escape_bstr; + use super::escape_bytes; use test_case::test_case; #[test_case(b"", b""; "empty")] #[test_case(b"\"", b"\\\""; "doublequote")] #[test_case(b":", b":"; "colon")] fn escape(input: &[u8], expected: &[u8]) { - assert_eq!(expected, escape_bstr(input)) + assert_eq!(expected, escape_bytes(input)) } } |