Replace encoding with encoding_rs

Cargo.toml

@@ -40,7 +40,7 @@ required-features = ["sql-browser-smol"]
 [dependencies]
 enumflags2 = "0.7"
 byteorder = "1.0"
-encoding = "0.2"
+encoding_rs = "0.8"
 once_cell = "1.3"
 thiserror = "1.0"
 bytes = "1.0"

src/tds/codec/column_data.rs

@@ -31,7 +31,6 @@ use crate::{
 };
 use bytes::BufMut;
 pub(crate) use bytes_mut_with_type_info::BytesMutWithTypeInfo;
-use encoding::EncoderTrap;
 use std::borrow::{BorrowMut, Cow};
 use uuid::Uuid;
 
@@ -302,10 +301,19 @@ impl<'a> Encode<BytesMutWithTypeInfo<'a>> for ColumnData<'a> {
                     || vlc.r#type() == VarLenType::BigVarChar =>
             {
                 if let Some(str) = opt {
-                    let encoder = vlc.collation().as_ref().unwrap().encoding()?;
-                    let bytes = encoder
-                        .encode(str.as_ref(), EncoderTrap::Strict)
-                        .map_err(crate::Error::Encoding)?;
+                    let mut encoder = vlc.collation().as_ref().unwrap().encoding()?.new_encoder();
+                    let len = encoder
+                        .max_buffer_length_from_utf8_without_replacement(str.len())
+                        .unwrap();
+                    let mut bytes = Vec::with_capacity(len);
+                    let (res, _) = encoder.encode_from_utf8_to_vec_without_replacement(
+                        str.as_ref(),
+                        &mut bytes,
+                        true,
+                    );
+                    if let encoding_rs::EncoderResult::Unmappable(_) = res {
+                        return Err(crate::Error::Encoding("unrepresentable character".into()));
+                    }
 
                     if bytes.len() > vlc.len() {
                         return Err(crate::Error::BulkInput(

src/tds/codec/column_data/string.rs

@@ -1,7 +1,6 @@
 use std::borrow::Cow;
 
 use byteorder::{ByteOrder, LittleEndian};
-use encoding::DecoderTrap;
 
 use crate::{error::Error, sql_read_bytes::SqlReadBytes, tds::Collation, VarLenType};
 
@@ -24,9 +23,10 @@ where
             let collation = collation.as_ref().unwrap();
             let encoder = collation.encoding()?;
 
-            let s: String = encoder
-                .decode(buf.as_ref(), DecoderTrap::Strict)
-                .map_err(Error::Encoding)?;
+            let s = encoder
+                .decode_without_bom_handling_and_without_replacement(buf.as_ref())
+                .ok_or_else(|| Error::Encoding("invalid sequence".into()))?
+                .to_string();
 
             Ok(Some(s.into()))
         }

src/tds/codec/column_data/text.rs

@@ -1,5 +1,3 @@
-use encoding::DecoderTrap;
-
 use crate::{error::Error, sql_read_bytes::SqlReadBytes, tds::Collation, ColumnData};
 
 pub(crate) async fn decode<R>(
@@ -34,8 +32,9 @@ where
             }
 
             encoder
-                .decode(buf.as_ref(), DecoderTrap::Strict)
-                .map_err(Error::Encoding)?
+                .decode_without_bom_handling_and_without_replacement(buf.as_ref())
+                .ok_or_else(|| Error::Encoding("invalid sequence".into()))?
+                .to_string()
         }
         // NTEXT
         None => {