diff --git a/Cargo.lock b/Cargo.lock index 3b6d9b364d689a6740a5e5d85f6b7aeb84de6bf2..b241569ffb092268179f7bac0f9cbef665f6a9b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5602,6 +5602,7 @@ dependencies = [ "ui", "util", "workspace", + "workspace-hack", ] [[package]] diff --git a/crates/encodings/Cargo.toml b/crates/encodings/Cargo.toml index a4c2b959e8343b9176216ff5434ad8e46d31f3a8..19456909425d5b926e4bddda248581a5ef15ce7f 100644 --- a/crates/encodings/Cargo.toml +++ b/crates/encodings/Cargo.toml @@ -16,6 +16,8 @@ settings.workspace = true ui.workspace = true util.workspace = true workspace.workspace = true +workspace-hack.workspace = true + [lints] workspace = true diff --git a/crates/fs/src/encodings.rs b/crates/fs/src/encodings.rs index 8aecbcb7646f2588c5a3a9e124250c678fd28611..efdd6fc187434cfff4d465f99cb5dbaba19673b0 100644 --- a/crates/fs/src/encodings.rs +++ b/crates/fs/src/encodings.rs @@ -86,11 +86,11 @@ impl EncodingWrapper { } /// Convert a byte vector from a specified encoding to a UTF-8 string. -pub async fn to_utf8<'a>(input: Vec, encoding: EncodingWrapper) -> Result { - Ok(encoding.decode(input).await?) +pub async fn to_utf8(input: Vec, encoding: EncodingWrapper) -> Result { + encoding.decode(input).await } /// Convert a UTF-8 string to a byte vector in a specified encoding. -pub async fn from_utf8<'a>(input: String, target: EncodingWrapper) -> Result> { - Ok(target.encode(input).await?) +pub async fn from_utf8(input: String, target: EncodingWrapper) -> Result> { + target.encode(input).await }