Skip to content

Commit 5888ecd

Browse files
simonwuelkersimonwuelker
committed
Make ServoMedia::get infallible
It was already infallible before, but returned a Result type for unknown reasons. The relevant Code hasn't been touched for 7 years. I think the original intention was to make backend creation fallible, but as mentioned before it currently isn't, and even if it were it seems more reasonable to return a Result from ServoMedia::init. Signed-off-by: Simon Wülker <[email protected]>
1 parent fdc8996 commit 5888ecd

24 files changed

+48
-113
lines changed

‎examples/audio_decoder.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ fn run_example(servo_media: Arc<ServoMedia>) {
8686

8787
fn main() {
8888
ServoMedia::init::<servo_media_auto::Backend>();
89-
if let Ok(servo_media) = ServoMedia::get() {
90-
run_example(servo_media);
91-
} else {
92-
unreachable!()
93-
}
89+
let servo_media = ServoMedia::get();
90+
run_example(servo_media);
91+
9492
}

‎examples/audioinput_stream.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
1717

1818
fn main() {
1919
ServoMedia::init::<servo_media_auto::Backend>();
20-
if let Ok(servo_media) = ServoMedia::get() {
21-
run_example(servo_media);
22-
} else {
23-
unreachable!();
24-
}
20+
let servo_media = ServoMedia::get();
21+
run_example(servo_media);
2522
}

‎examples/biquad.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
6565

6666
fn main() {
6767
ServoMedia::init::<servo_media_auto::Backend>();
68-
if let Ok(servo_media) = ServoMedia::get() {
69-
run_example(servo_media);
70-
} else {
71-
unreachable!();
72-
}
68+
let servo_media = ServoMedia::get();
69+
run_example(servo_media);
7370
}

‎examples/channels.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
5353

5454
fn main() {
5555
ServoMedia::init::<servo_media_auto::Backend>();
56-
if let Ok(servo_media) = ServoMedia::get() {
57-
run_example(servo_media);
58-
} else {
59-
unreachable!();
60-
}
56+
let servo_media = ServoMedia::get();
57+
run_example(servo_media);
6158
}

‎examples/channelsum.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
6464

6565
fn main() {
6666
ServoMedia::init::<servo_media_auto::Backend>();
67-
if let Ok(servo_media) = ServoMedia::get() {
68-
run_example(servo_media);
69-
} else {
70-
unreachable!();
71-
}
67+
let servo_media = ServoMedia::get();
68+
run_example(servo_media);
7269
}

‎examples/constant_source.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
9191

9292
fn main() {
9393
ServoMedia::init::<servo_media_auto::Backend>();
94-
if let Ok(servo_media) = ServoMedia::get() {
95-
run_example(servo_media);
96-
} else {
97-
unreachable!();
98-
}
94+
let servo_media = ServoMedia::get();
95+
run_example(servo_media);
9996
}

‎examples/dummy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ use servo_media_dummy::DummyBackend;
66

77
fn main() {
88
ServoMedia::init::<DummyBackend>();
9-
ServoMedia::get().expect("couldn't create a dummy backend?");
9+
ServoMedia::get();
1010
}

‎examples/iir_filter.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
7676

7777
fn main() {
7878
ServoMedia::init::<servo_media_auto::Backend>();
79-
if let Ok(servo_media) = ServoMedia::get() {
80-
run_example(servo_media);
81-
} else {
82-
unreachable!();
83-
}
79+
let servo_media = ServoMedia::get();
80+
run_example(servo_media);
8481
}

‎examples/muted_audiocontext.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
8282

8383
fn main() {
8484
ServoMedia::init::<servo_media_auto::Backend>();
85-
if let Ok(servo_media) = ServoMedia::get() {
86-
run_example(servo_media);
87-
} else {
88-
unreachable!();
89-
}
85+
let servo_media = ServoMedia::get();
86+
run_example(servo_media);
9087
}

‎examples/offline_context.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
7676

7777
fn main() {
7878
ServoMedia::init::<servo_media_auto::Backend>();
79-
if let Ok(servo_media) = ServoMedia::get() {
80-
run_example(servo_media);
81-
} else {
82-
unreachable!()
83-
}
79+
let servo_media = ServoMedia::get();
80+
run_example(servo_media);
8481
}

‎examples/oscillator.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
126126

127127
fn main() {
128128
ServoMedia::init::<servo_media_auto::Backend>();
129-
if let Ok(servo_media) = ServoMedia::get() {
130-
run_example(servo_media);
131-
} else {
132-
unreachable!();
133-
}
129+
let servo_media = ServoMedia::get();
130+
run_example(servo_media);
134131
}

‎examples/panner.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
176176

177177
fn main() {
178178
ServoMedia::init::<servo_media_auto::Backend>();
179-
if let Ok(servo_media) = ServoMedia::get() {
180-
run_example(servo_media);
181-
} else {
182-
unreachable!();
183-
}
179+
let servo_media = ServoMedia::get();
180+
run_example(servo_media);
184181
}

‎examples/params.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
9898

9999
fn main() {
100100
ServoMedia::init::<servo_media_auto::Backend>();
101-
if let Ok(servo_media) = ServoMedia::get() {
102-
run_example(servo_media);
103-
} else {
104-
unreachable!();
105-
}
101+
let servo_media = ServoMedia::get();
102+
run_example(servo_media);
106103
}

‎examples/params_connect.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
5353

5454
fn main() {
5555
ServoMedia::init::<servo_media_auto::Backend>();
56-
if let Ok(servo_media) = ServoMedia::get() {
57-
run_example(servo_media);
58-
} else {
59-
unreachable!();
60-
}
56+
let servo_media = ServoMedia::get();
57+
run_example(servo_media);
6158
}

‎examples/params_connect2.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
5353

5454
fn main() {
5555
ServoMedia::init::<servo_media_auto::Backend>();
56-
if let Ok(servo_media) = ServoMedia::get() {
57-
run_example(servo_media);
58-
} else {
59-
unreachable!();
60-
}
56+
let servo_media = ServoMedia::get();
57+
run_example(servo_media);
6158
}

‎examples/params_settarget.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
6262

6363
fn main() {
6464
ServoMedia::init::<servo_media_auto::Backend>();
65-
if let Ok(servo_media) = ServoMedia::get() {
66-
run_example(servo_media);
67-
} else {
68-
unreachable!();
69-
}
65+
let servo_media = ServoMedia::get();
66+
run_example(servo_media);
7067
}

‎examples/play.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
8686

8787
fn main() {
8888
ServoMedia::init::<servo_media_auto::Backend>();
89-
if let Ok(servo_media) = ServoMedia::get() {
90-
run_example(servo_media);
91-
} else {
92-
unreachable!();
93-
}
89+
let servo_media = ServoMedia::get();
90+
run_example(servo_media);
9491
}

‎examples/set_value_curve.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
8484

8585
fn main() {
8686
ServoMedia::init::<servo_media_auto::Backend>();
87-
if let Ok(servo_media) = ServoMedia::get() {
88-
run_example(servo_media);
89-
} else {
90-
unreachable!();
91-
}
87+
let servo_media = ServoMedia::get();
88+
run_example(servo_media);
9289
}

‎examples/stereo_panner.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
5454

5555
fn main() {
5656
ServoMedia::init::<servo_media_auto::Backend>();
57-
if let Ok(servo_media) = ServoMedia::get() {
58-
run_example(servo_media);
59-
} else {
60-
unreachable!();
61-
}
57+
let servo_media = ServoMedia::get();
58+
run_example(servo_media);
6259
}

‎examples/stream_dest_node.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
4141

4242
fn main() {
4343
ServoMedia::init::<servo_media_auto::Backend>();
44-
if let Ok(servo_media) = ServoMedia::get() {
45-
run_example(servo_media);
46-
} else {
47-
unreachable!();
48-
}
44+
let servo_media = ServoMedia::get();
45+
run_example(servo_media);
4946
}

‎examples/stream_reader_node.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
2626

2727
fn main() {
2828
ServoMedia::init::<servo_media_auto::Backend>();
29-
if let Ok(servo_media) = ServoMedia::get() {
30-
run_example(servo_media);
31-
} else {
32-
unreachable!();
33-
}
29+
let servo_media = ServoMedia::get();
30+
run_example(servo_media);
3431
}

‎examples/videoinput_stream.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
1717

1818
fn main() {
1919
ServoMedia::init::<servo_media_auto::Backend>();
20-
if let Ok(servo_media) = ServoMedia::get() {
21-
run_example(servo_media);
22-
} else {
23-
unreachable!();
24-
}
20+
let servo_media = ServoMedia::get();
21+
run_example(servo_media);
2522
}

‎examples/wave_shaper.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ fn run_example(servo_media: Arc<ServoMedia>) {
9494

9595
fn main() {
9696
ServoMedia::init::<servo_media_auto::Backend>();
97-
if let Ok(servo_media) = ServoMedia::get() {
98-
run_example(servo_media);
99-
} else {
100-
unreachable!();
101-
}
97+
let servo_media = ServoMedia::get();
98+
run_example(servo_media);
10299
}

‎servo-media/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ impl ServoMedia {
106106
thread::spawn(move || INSTANCE.get_or_init(|| Arc::new(ServoMedia(backend_factory()))));
107107
}
108108

109-
pub fn get() -> Result<Arc<ServoMedia>, ()> {
110-
Ok(INSTANCE.wait().clone())
109+
pub fn get() -> Arc<ServoMedia> {
110+
INSTANCE.wait().clone()
111111
}
112112
}
113113

0 commit comments

Comments
 (0)