daviddoji/100-exercises-to-learn-rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: error type

Browse Source
This commit is contained in:
LukeMathWalker
2024-05-13 20:52:40 +02:00
parent a0f3a6eaa7
commit 0e38fa8ca7
7 changed files with 66 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
exercises/07_threads/10_patch/Cargo.toml
View File

@@ -5,3 +5,4 @@ edition = "2021"
[dependencies]
ticket_fields = { path = "../../../helpers/ticket_fields" }
thiserror = "1.0.59"

32
exercises/07_threads/10_patch/src/lib.rs
View File

@@ -1,4 +1,4 @@
use std::sync::mpsc::{sync_channel, Receiver, SyncSender, TrySendError};
use std::sync::mpsc::{sync_channel, Receiver, SyncSender};
// TODO: Implement the patching functionality.
use crate::data::{Ticket, TicketDraft, TicketPatch};
@@ -13,27 +13,35 @@ pub struct TicketStoreClient {
}
impl TicketStoreClient {
pub fn insert(&self, draft: TicketDraft) -> Result<TicketId, TrySendError<Command>> {
pub fn insert(&self, draft: TicketDraft) -> Result<TicketId, OverloadedError> {
let (response_sender, response_receiver) = sync_channel(1);
self.sender.try_send(Command::Insert {
draft,
response_channel: response_sender,
})?;
self.sender
.try_send(Command::Insert {
draft,
response_channel: response_sender,
})
.map_err(|_| OverloadedError)?;
Ok(response_receiver.recv().unwrap())
}
pub fn get(&self, id: TicketId) -> Result<Option<Ticket>, TrySendError<Command>> {
pub fn get(&self, id: TicketId) -> Result<Option<Ticket>, OverloadedError> {
let (response_sender, response_receiver) = sync_channel(1);
self.sender.try_send(Command::Get {
id,
response_channel: response_sender,
})?;
self.sender
.try_send(Command::Get {
id,
response_channel: response_sender,
})
.map_err(|_| OverloadedError)?;
Ok(response_receiver.recv().unwrap())
}
pub fn update(&self, ticket_patch: TicketPatch) -> Result<(), TrySendError<Command>> {}
pub fn update(&self, ticket_patch: TicketPatch) -> Result<(), OverloadedError> {}
}
#[derive(Debug, thiserror::Error)]
#[error("The store is overloaded")]
pub struct OverloadedError;
pub fn launch(capacity: usize) -> TicketStoreClient {
let (sender, receiver) = sync_channel(capacity);
std::thread::spawn(move || server(receiver));

1
exercises/07_threads/11_locks/Cargo.toml
View File

@@ -5,3 +5,4 @@ edition = "2021"
[dependencies]
ticket_fields = { path = "../../../helpers/ticket_fields" }
thiserror = "1.0.60"

28
exercises/07_threads/11_locks/src/lib.rs
View File

@@ -16,25 +16,33 @@ pub struct TicketStoreClient {
}
impl TicketStoreClient {
pub fn insert(&self, draft: TicketDraft) -> Result<TicketId, TrySendError<Command>> {
pub fn insert(&self, draft: TicketDraft) -> Result<TicketId, OverloadedError> {
let (response_sender, response_receiver) = sync_channel(1);
self.sender.try_send(Command::Insert {
draft,
response_channel: response_sender,
})?;
self.sender
.try_send(Command::Insert {
draft,
response_channel: response_sender,
})
.map_err(|_| OverloadedError)?;
Ok(response_receiver.recv().unwrap())
}
pub fn get(&self, id: TicketId) -> Result<Option<Arc<Mutex<Ticket>>>, TrySendError<Command>> {
pub fn get(&self, id: TicketId) -> Result<Option<Arc<Mutex<Ticket>>>, OverloadedError> {
let (response_sender, response_receiver) = sync_channel(1);
self.sender.try_send(Command::Get {
id,
response_channel: response_sender,
})?;
self.sender
.try_send(Command::Get {
id,
response_channel: response_sender,
})
.map_err(|_| OverloadedError)?;
Ok(response_receiver.recv().unwrap())
}
}
#[derive(Debug, thiserror::Error)]
#[error("The store is overloaded")]
pub struct OverloadedError;
pub fn launch(capacity: usize) -> TicketStoreClient {
let (sender, receiver) = sync_channel(capacity);
std::thread::spawn(move || server(receiver));

1
exercises/07_threads/12_rw_lock/Cargo.toml
View File

@@ -5,3 +5,4 @@ edition = "2021"
[dependencies]
ticket_fields = { path = "../../../helpers/ticket_fields" }
thiserror = "1.0.60"

28
exercises/07_threads/12_rw_lock/src/lib.rs
View File

@@ -15,25 +15,33 @@ pub struct TicketStoreClient {
}
impl TicketStoreClient {
pub fn insert(&self, draft: TicketDraft) -> Result<TicketId, TrySendError<Command>> {
pub fn insert(&self, draft: TicketDraft) -> Result<TicketId, OverloadedError> {
let (response_sender, response_receiver) = sync_channel(1);
self.sender.try_send(Command::Insert {
draft,
response_channel: response_sender,
})?;
self.sender
.try_send(Command::Insert {
draft,
response_channel: response_sender,
})
.map_err(|_| OverloadedError)?;
Ok(response_receiver.recv().unwrap())
}
pub fn get(&self, id: TicketId) -> Result<Option<Arc<Mutex<Ticket>>>, TrySendError<Command>> {
pub fn get(&self, id: TicketId) -> Result<Option<Arc<Mutex<Ticket>>>, OverloadedError> {
let (response_sender, response_receiver) = sync_channel(1);
self.sender.try_send(Command::Get {
id,
response_channel: response_sender,
})?;
self.sender
.try_send(Command::Get {
id,
response_channel: response_sender,
})
.map_err(|_| OverloadedError)?;
Ok(response_receiver.recv().unwrap())
}
}
#[derive(Debug, thiserror::Error)]
#[error("The store is overloaded")]
pub struct OverloadedError;
pub fn launch(capacity: usize) -> TicketStoreClient {
let (sender, receiver) = sync_channel(capacity);
std::thread::spawn(move || server(receiver));