ref(pii): Use external utf16string crate (#807)

The relay-wstring crate has been split off to the utf16string crate,
this switches our code over.

Author: flub

Cargo.lock

@@ -27,7 +27,6 @@ pest_derive = "2.1.0"
 regex = "1.3.9"
 relay-common = { path = "../relay-common" }
 relay-general-derive = { path = "derive" }
-relay-wstring = { path = "../relay-wstring" }
 schemars = { version = "0.8.0-alpha-4", features = ["uuid", "chrono"], optional = true }
 scroll = "0.9.0"
 serde = { version = "1.0.114", features = ["derive"] }
@@ -37,6 +36,7 @@ sha-1 = "0.8.1"
 smallvec = { version = "1.4.0", features = ["serde"] }
 uaparser = { version = "0.3.3", optional = true }
 url = "2.1.1"
+utf16string = "0.2.0"
 uuid = { version = "0.8.1", features = ["v4", "serde"] }
 
 [dev-dependencies]

relay-general/Cargo.toml

@@ -4,8 +4,7 @@ use std::iter::FusedIterator;
 use regex::bytes::RegexBuilder as BytesRegexBuilder;
 use regex::{Match, Regex};
 use smallvec::SmallVec;
-
-use relay_wstring::WStr;
+use utf16string::{LittleEndian, WStr};
 
 use crate::pii::compiledconfig::RuleRef;
 use crate::pii::regexes::{get_regex_for_rule_type, ReplaceBehavior};
@@ -106,7 +105,11 @@ fn apply_regex_to_utf16le_bytes(
 }
 
 /// Extract the matching encoded slice from the encoded string.
-fn get_wstr_match<'a>(all_text: &str, re_match: Match, all_encoded: &'a mut WStr) -> &'a mut WStr {
+fn get_wstr_match<'a>(
+    all_text: &str,
+    re_match: Match,
+    all_encoded: &'a mut WStr<LittleEndian>,
+) -> &'a mut WStr<LittleEndian> {
     let mut encoded_start = 0;
     let mut encoded_end = all_encoded.len();
 
@@ -172,7 +175,7 @@ trait StringMods: AsRef<[u8]> {
     }
 }
 
-impl StringMods for WStr {
+impl StringMods for WStr<LittleEndian> {
     fn fill_content(&mut self, fill_char: char) {
         // If fill_char is too wide, fill_char.encode_utf16() will panic, fulfilling the
         // trait's contract that we must panic if fill_char is too wide.
@@ -325,7 +328,7 @@ impl<'a> FusedIterator for WStrSegmentIter<'a> {}
 /// longer match.
 struct WStrSegment<'a> {
     /// The raw bytes of this segment.
-    encoded: &'a mut WStr,
+    encoded: &'a mut WStr<LittleEndian>,
     /// The decoded string of this segment.
     decoded: String,
 }
@@ -469,7 +472,11 @@ impl<'a> PiiAttachmentsProcessor<'a> {
     }
 
     /// Scrub a filepath, preserving the basename.
-    pub fn scrub_utf16_filepath(&self, path: &mut WStr, state: &ProcessingState<'_>) -> bool {
+    pub fn scrub_utf16_filepath(
+        &self,
+        path: &mut WStr<LittleEndian>,
+        state: &ProcessingState<'_>,
+    ) -> bool {
         let index =
             path.char_indices().rev().find_map(
                 |(i, c)| {

relay-general/src/pii/attachments.rs

@@ -15,8 +15,7 @@ use minidump::{
 };
 use num_traits::FromPrimitive;
 use scroll::Endian;
-
-use relay_wstring::{Utf16Error, WStr};
+use utf16string::{Utf16Error, WStr};
 
 use crate::pii::{PiiAttachmentsProcessor, ScrubEncodings};
 use crate::processor::{FieldAttrs, Pii, ValueType};