Use let-else instead of match for weak reference upgrades

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1375>

8 files changed, 36 insertions, 54 deletions

diff --git a/net/aws/src/s3hlssink/imp.rs b/net/aws/src/s3hlssink/imp.rs
index 92a27111f..dde5714dd 100644
--- a/net/aws/src/s3hlssink/imp.rs
+++ b/net/aws/src/s3hlssink/imp.rs
@@ -642,9 +642,8 @@ impl ObjectImpl for S3HlsSink {
         self.hlssink.connect("get-playlist-stream", false, {
             let self_weak = self.downgrade();
             move |args| -> Option<glib::Value> {
-                let self_ = match self_weak.upgrade() {
-                    Some(self_) => self_,
-                    None => return None,
+                let Some(self_) = self_weak.upgrade() else {
+                    return None;
                 };
 
                 let s3client = self_.s3client_from_settings();
@@ -677,9 +676,8 @@ impl ObjectImpl for S3HlsSink {
         self.hlssink.connect("get-fragment-stream", false, {
             let self_weak = self.downgrade();
             move |args| -> Option<glib::Value> {
-                let self_ = match self_weak.upgrade() {
-                    Some(self_) => self_,
-                    None => return None,
+                let Some(self_) = self_weak.upgrade() else {
+                    return None;
                 };
 
                 let s3client = self_.s3client_from_settings();
@@ -712,9 +710,8 @@ impl ObjectImpl for S3HlsSink {
         self.hlssink.connect("delete-fragment", false, {
             let self_weak = self.downgrade();
             move |args| -> Option<glib::Value> {
-                let self_ = match self_weak.upgrade() {
-                    Some(self_) => self_,
-                    None => return None,
+                let Some(self_) = self_weak.upgrade() else {
+                    return None;
                 };
 
                 let s3_client = self_.s3client_from_settings();
diff --git a/net/hlssink3/examples/cmaf_live.rs b/net/hlssink3/examples/cmaf_live.rs
index 527389c18..4c7735ccd 100644
--- a/net/hlssink3/examples/cmaf_live.rs
+++ b/net/hlssink3/examples/cmaf_live.rs
@@ -269,9 +269,8 @@ fn main() -> Result<(), Error> {
 
         match msg.view() {
             MessageView::StateChanged(state_changed) => {
-                let pipeline = match pipeline_weak.upgrade() {
-                    Some(pipeline) => pipeline,
-                    None => break,
+                let Some(pipeline) = pipeline_weak.upgrade() else {
+                    break;
                 };
 
                 let mut need_write = write_playlist.lock().unwrap();
diff --git a/net/hlssink3/src/imp.rs b/net/hlssink3/src/imp.rs
index 7fafa6489..0198ccc47 100644
--- a/net/hlssink3/src/imp.rs
+++ b/net/hlssink3/src/imp.rs
@@ -782,9 +782,8 @@ impl ObjectImpl for HlsSink3 {
             .connect("format-location-full", false, {
                 let imp_weak = self.downgrade();
                 move |args| {
-                    let imp = match imp_weak.upgrade() {
-                        Some(imp) => imp,
-                        None => return Some(None::<String>.to_value()),
+                    let Some(imp) = imp_weak.upgrade() else {
+                        return Some(None::<String>.to_value());
                     };
                     let fragment_id = args[1].get::<u32>().unwrap();
                     gst::info!(CAT, imp: imp, "Got fragment-id: {}", fragment_id);
@@ -1322,9 +1321,8 @@ impl ObjectImpl for HlsCmafSink {
         settings.appsink.set_callbacks(
             gst_app::AppSinkCallbacks::builder()
                 .new_sample(move |sink| {
-                    let imp = match self_weak.upgrade() {
-                        Some(imp) => imp,
-                        _ => return Err(gst::FlowError::Eos),
+                    let Some(imp) = self_weak.upgrade() else {
+                        return Err(gst::FlowError::Eos);
                     };
 
                     let sample = sink.pull_sample().map_err(|_| gst::FlowError::Eos)?;
diff --git a/net/ndi/src/device_provider/imp.rs b/net/ndi/src/device_provider/imp.rs
index 069271e9b..eaecb7d27 100644
--- a/net/ndi/src/device_provider/imp.rs
+++ b/net/ndi/src/device_provider/imp.rs
@@ -87,9 +87,8 @@ impl DeviceProviderImpl for DeviceProvider {
         let mut first = true;
         *thread_guard = Some(thread::spawn(move || {
             {
-                let imp = match imp_weak.upgrade() {
-                    None => return,
-                    Some(imp) => imp,
+                let Some(imp) = imp_weak.upgrade() else {
+                    return;
                 };
 
                 let mut find_guard = imp.find.lock().unwrap();
@@ -109,9 +108,8 @@ impl DeviceProviderImpl for DeviceProvider {
             }
 
             loop {
-                let imp = match imp_weak.upgrade() {
-                    None => return,
-                    Some(imp) => imp,
+                let Some(imp) = imp_weak.upgrade() else {
+                    return;
                 };
 
                 if !imp.is_running.load(atomic::Ordering::SeqCst) {
diff --git a/net/ndi/src/ndisrc/receiver.rs b/net/ndi/src/ndisrc/receiver.rs
index 2fb94e2f6..ad27b2175 100644
--- a/net/ndi/src/ndisrc/receiver.rs
+++ b/net/ndi/src/ndisrc/receiver.rs
@@ -761,14 +761,12 @@ impl Receiver {
 
         // Capture until error or shutdown
         loop {
-            let receiver = match receiver.upgrade().map(Receiver) {
-                None => break,
-                Some(receiver) => receiver,
+            let Some(receiver) = receiver.upgrade().map(Receiver) else {
+                break;
             };
 
-            let element = match receiver.0.element.upgrade() {
-                None => return,
-                Some(element) => element,
+            let Some(element) = receiver.0.element.upgrade() else {
+                break;
             };
 
             let flushing = {
diff --git a/net/webrtc/src/whip_signaller/imp.rs b/net/webrtc/src/whip_signaller/imp.rs
index a483123bb..2924077b3 100644
--- a/net/webrtc/src/whip_signaller/imp.rs
+++ b/net/webrtc/src/whip_signaller/imp.rs
@@ -431,9 +431,8 @@ impl SignallableImpl for Signaller {
                             webrtcbin: &gst::Element| {
                 let obj_weak = signaller.downgrade();
                 webrtcbin.connect_notify(Some("ice-gathering-state"), move |webrtcbin, _pspec| {
-                    let obj = match obj_weak.upgrade() {
-                        Some(obj) => obj,
-                        None => return,
+                    let Some(obj) = obj_weak.upgrade() else {
+                        return;
                     };
 
                     let state =
diff --git a/net/webrtchttp/src/whepsrc/imp.rs b/net/webrtchttp/src/whepsrc/imp.rs
index a0b56f119..dd423a6f6 100644
--- a/net/webrtchttp/src/whepsrc/imp.rs
+++ b/net/webrtchttp/src/whepsrc/imp.rs
@@ -426,9 +426,8 @@ impl WhepSrc {
         let self_weak = self.downgrade();
         self.webrtcbin
             .connect_notify(Some("ice-gathering-state"), move |webrtcbin, _pspec| {
-                let self_ = match self_weak.upgrade() {
-                    Some(self_) => self_,
-                    None => return,
+                let Some(self_) = self_weak.upgrade() else {
+                    return;
                 };
 
                 let state = webrtcbin.property::<WebRTCICEGatheringState>("ice-gathering-state");
@@ -458,9 +457,8 @@ impl WhepSrc {
         let self_weak = self.downgrade();
         self.webrtcbin
             .connect_notify(Some("ice-connection-state"), move |webrtcbin, _pspec| {
-                let self_ = match self_weak.upgrade() {
-                    Some(self_) => self_,
-                    None => return,
+                let Some(self_) = self_weak.upgrade() else {
+                    return;
                 };
 
                 let state = webrtcbin.property::<WebRTCICEConnectionState>("ice-connection-state");
@@ -489,9 +487,8 @@ impl WhepSrc {
         let self_weak = self.downgrade();
         self.webrtcbin
             .connect_notify(Some("connection-state"), move |webrtcbin, _pspec| {
-                let self_ = match self_weak.upgrade() {
-                    Some(self_) => self_,
-                    None => return,
+                let Some(self_) = self_weak.upgrade() else {
+                    return;
                 };
 
                 let state = webrtcbin.property::<WebRTCPeerConnectionState>("connection-state");
@@ -520,9 +517,8 @@ impl WhepSrc {
 
         let self_weak = self.downgrade();
         self.webrtcbin.connect_pad_added(move |_, pad| {
-            let self_ = match self_weak.upgrade() {
-                Some(self_) => self_,
-                None => return,
+            let Some(self_) = self_weak.upgrade() else {
+                return;
             };
 
             gst::debug!(
@@ -547,9 +543,8 @@ impl WhepSrc {
         let self_weak = self.downgrade();
         self.webrtcbin.connect("on-negotiation-needed", false, {
             move |_| {
-                let self_ = match self_weak.upgrade() {
-                    Some(self_) => self_,
-                    None => return None,
+                let Some(self_) = self_weak.upgrade() else {
+                    return None;
                 };
 
                 let settings = self_.settings.lock().unwrap();
@@ -780,9 +775,8 @@ impl WhepSrc {
     fn generate_offer(&self) {
         let self_weak = self.downgrade();
         let promise = gst::Promise::with_change_func(move |reply| {
-            let self_ = match self_weak.upgrade() {
-                Some(self_) => self_,
-                None => return,
+            let Some(self_) = self_weak.upgrade() else {
+                return;
             };
 
             let reply = match reply {
diff --git a/net/webrtchttp/src/whipsink/imp.rs b/net/webrtchttp/src/whipsink/imp.rs
index 0d1d3649f..619b0214e 100644
--- a/net/webrtchttp/src/whipsink/imp.rs
+++ b/net/webrtchttp/src/whipsink/imp.rs
@@ -357,9 +357,8 @@ impl ObjectImpl for WhipSink {
         let self_weak = self.downgrade();
         self.webrtcbin
             .connect_notify(Some("ice-gathering-state"), move |webrtcbin, _pspec| {
-                let self_ = match self_weak.upgrade() {
-                    Some(self_) => self_,
-                    None => return,
+                let Some(self_) = self_weak.upgrade() else {
+                    return;
                 };
 
                 let state = webrtcbin.property::<WebRTCICEGatheringState>("ice-gathering-state");