Skip to content

Commit fa8d913

Browse files
committed
chore: clean up old generic error solution
1 parent 9139493 commit fa8d913

File tree

5 files changed

+4
-47
lines changed

5 files changed

+4
-47
lines changed

crates/bitwarden-core/src/error.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::{borrow::Cow, fmt::Debug};
44

55
use bitwarden_api_api::apis::Error as ApiError;
66
use bitwarden_api_identity::apis::Error as IdentityError;
7+
use bitwarden_error::prelude::*;
78
use log::debug;
89
use reqwest::StatusCode;
910
use thiserror::Error;
@@ -12,6 +13,7 @@ use validator::ValidationErrors;
1213
#[cfg(feature = "internal")]
1314
use crate::client::encryption_settings::EncryptionSettingsError;
1415

16+
#[bitwarden_error(flat)]
1517
#[derive(Debug, Error)]
1618
pub enum Error {
1719
#[error(transparent)]

crates/bitwarden-wasm-internal/src/crypto.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ use bitwarden_core::{
77
};
88
use wasm_bindgen::prelude::*;
99

10-
use crate::error::Result;
11-
1210
#[wasm_bindgen]
1311
pub struct ClientCrypto(Rc<Client>);
1412

crates/bitwarden-wasm-internal/src/error.rs

Lines changed: 0 additions & 40 deletions
This file was deleted.

crates/bitwarden-wasm-internal/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
mod client;
22
mod crypto;
33
mod custom_types;
4-
mod error;
54
mod vault;
65

76
pub use client::BitwardenClient;

crates/bitwarden-wasm-internal/src/vault/folders.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ use bitwarden_core::Client;
44
use bitwarden_vault::{ClientVaultExt, Folder, FolderView};
55
use wasm_bindgen::prelude::*;
66

7-
use crate::error::Result;
8-
97
#[wasm_bindgen]
108
pub struct ClientFolders(Rc<Client>);
119

@@ -18,7 +16,7 @@ impl ClientFolders {
1816
#[wasm_bindgen]
1917
impl ClientFolders {
2018
/// Decrypt folder
21-
pub fn decrypt(&self, folder: Folder) -> Result<FolderView> {
22-
Ok(self.0.vault().folders().decrypt(folder)?)
19+
pub fn decrypt(&self, folder: Folder) -> Result<FolderView, bitwarden_core::Error> {
20+
self.0.vault().folders().decrypt(folder)
2321
}
2422
}

0 commit comments

Comments
 (0)