projects/godot-tts
1
0
Fork 0
mirror of https://github.com/lightsoutgames/godot-tts synced 2024-11-22 12:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unwrap in favor of expect.

Browse Source
This commit is contained in:
Nolan Darilek 2020-11-24 12:20:02 -06:00
parent 691997023a
commit 65311abdeb
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib.rs
View File

@ -30,7 +30,7 @@ struct TTS(Tts, Receiver<Msg>);
impl TTS { impl TTS {
fn new(owner: &Node) -> Self { fn new(owner: &Node) -> Self {
owner.set_pause_mode(2); owner.set_pause_mode(2);
let tts = Tts::default().unwrap(); let tts = Tts::default().expect("Failed to initialize TTS");
let (tx, rx) = channel(); let (tx, rx) = channel();
let Features { let Features {
utterance_callbacks, utterance_callbacks,
@ -40,15 +40,20 @@ impl TTS {
let tx_end = tx.clone(); let tx_end = tx.clone();
let tx_stop = tx.clone(); let tx_stop = tx.clone();
tts.on_utterance_begin(Some(Box::new(move |utterance| { tts.on_utterance_begin(Some(Box::new(move |utterance| {
tx.send(Msg::UtteranceBegin(utterance)).unwrap(); tx.send(Msg::UtteranceBegin(utterance))
.expect("Failed to send UtteranceBegin");
}))) })))
.expect("Failed to set utterance_begin callback"); .expect("Failed to set utterance_begin callback");
tts.on_utterance_end(Some(Box::new(move |utterance| { tts.on_utterance_end(Some(Box::new(move |utterance| {
tx_end.send(Msg::UtteranceEnd(utterance)).unwrap(); tx_end
.send(Msg::UtteranceEnd(utterance))
.expect("Failed to send UtteranceEnd");
}))) })))
.expect("Failed to set utterance_end callback"); .expect("Failed to set utterance_end callback");
tts.on_utterance_stop(Some(Box::new(move |utterance| { tts.on_utterance_stop(Some(Box::new(move |utterance| {
tx_stop.send(Msg::UtteranceStop(utterance)).unwrap(); tx_stop
.send(Msg::UtteranceStop(utterance))
.expect("Failed to send UtteranceStop");
}))) })))
.expect("Failed to set utterance_stop callback"); .expect("Failed to set utterance_stop callback");
} }
@ -74,7 +79,7 @@ impl TTS {
} else if v > this.0.max_rate() { } else if v > this.0.max_rate() {
v = this.0.max_rate(); v = this.0.max_rate();
} }
this.0.set_rate(v).unwrap(); this.0.set_rate(v).expect("Failed to set rate");
} }
}) })
.done(); .done();
@ -154,7 +159,9 @@ impl TTS {
.. ..
} = this.0.supported_features(); } = this.0.supported_features();
if is_speaking_supported { if is_speaking_supported {
this.0.is_speaking().unwrap() this.0
.is_speaking()
.expect("Failed to determine if speaking")
} else { } else {
false false
} }
@ -207,7 +214,7 @@ impl TTS {
#[export] #[export]
fn stop(&mut self, _owner: &Node) { fn stop(&mut self, _owner: &Node) {
self.0.stop().unwrap(); self.0.stop().expect("Failed to stop");
} }
#[export] #[export]