Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 188d0f5a authored by Chris Wailes's avatar Chris Wailes Committed by Automerger Merge Worker
Browse files

Fix warnings in preperatin for Rust 1.53.0 am: 88d5702d 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1778788

Change-Id: I232475b61ce1b8bf68b9c729a2ac55b684413eaf
parents 8893406e 88d5702d

doh.rs

+15 −19
Original line number Diff line number Diff line
@@ -382,8 +382,7 @@ impl DohConnection { 
            .timeout()

            .unwrap_or_else(|| Duration::from_millis(QUICHE_IDLE_TIMEOUT_MS));

        match timeout(ts, self.udp_sk.recv_from(&mut buf)).await {

            Ok(v) => {

                match v {

            Ok(v) => match v {

                Ok((size, from)) => {

                    let recv_info = quiche::RecvInfo { from };

                    let processed = match self.quic_conn.recv(&mut buf[..size], recv_info) {
@@ -393,17 +392,14 @@ impl DohConnection { 
                        }

                    };

                    debug!("processed {} bytes", processed);

                        return Ok(());

                    }

                    Err(e) => {

                        return Err(anyhow!("socket recv failed: {:?}", e));

                    }

                };

                    Ok(())

                }

                Err(e) => Err(anyhow!("socket recv failed: {:?}", e)),

            },

            Err(_) => {

                warn!("timeout did not receive value within {:?} ms, {}", ts, self.net_id);

                self.quic_conn.on_timeout();

                return Ok(());

                Ok(())

            }

        }

    }