chore(*): Rename Wpa2Passphrase to WpaPsk (#96)

* Rename Wpa2Passphrase to WpaPsk

* Update toolchain

* Formatting

Author: MathiasKoch

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.80"
+channel = "1.83"
 components = [ "rust-src", "rustfmt", "llvm-tools" ]
 targets = [
     "thumbv6m-none-eabi",

src/asynch/control.rs

@@ -443,7 +443,7 @@ impl<'a, const INGRESS_BUF_SIZE: usize, const URC_CAPACITY: usize>
                     })
                     .await?;
             }
-            WifiAuthentication::Wpa2Passphrase(passphrase) => {
+            WifiAuthentication::WpaPsk(passphrase) => {
                 (&self.at_client)
                     .send_retry(&SetWifiAPConfig {
                         ap_config_id: AccessPointId::Id0,
@@ -548,7 +548,7 @@ impl<'a, const INGRESS_BUF_SIZE: usize, const URC_CAPACITY: usize>
                     })
                     .await?;
             }
-            WifiAuthentication::Wpa2Passphrase(passphrase) => {
+            WifiAuthentication::WpaPsk(passphrase) => {
                 (&self.at_client)
                     .send_retry(&SetWifiStationConfig {
                         config_id: CONFIG_ID,

src/asynch/runner.rs

@@ -212,7 +212,6 @@ where
                 Ok(())
             }
             Either::First(r) => r.map(drop),
-            Either::Second(_) => unreachable!(),
         }
     }
 
@@ -325,7 +324,6 @@ where
         .await
         {
             Either::First(r) => r?,
-            Either::Second(_) => unreachable!(),
         }
 
         self.ch.mark_initialized();

src/asynch/ublox_stack/tcp.rs

@@ -698,7 +698,10 @@ pub mod client {
         for TcpClient<'d, INGRESS_BUF_SIZE, URC_CAPACITY, N, TX_SZ, RX_SZ>
     {
         type Error = Error;
-        type Connection<'m> = TcpConnection<'m, N, TX_SZ, RX_SZ> where Self: 'm;
+        type Connection<'m>
+            = TcpConnection<'m, N, TX_SZ, RX_SZ>
+        where
+            Self: 'm;
 
         async fn connect<'a>(
             &'a self,

src/asynch/ublox_stack/tls.rs

@@ -348,7 +348,10 @@ pub mod client {
         for TlsClient<'d, INGRESS_BUF_SIZE, URC_CAPACITY, N, TX_SZ, RX_SZ>
     {
         type Error = Error;
-        type Connection<'m> = TlsConnection<'m, N, TX_SZ, RX_SZ> where Self: 'm;
+        type Connection<'m>
+            = TlsConnection<'m, N, TX_SZ, RX_SZ>
+        where
+            Self: 'm;
 
         async fn connect<'a>(
             &'a self,

src/options.rs

@@ -66,13 +66,13 @@ impl HotspotOptions {
 pub enum WifiAuthentication<'a> {
     #[default]
     None,
-    Wpa2Passphrase(&'a str),
-    // Wpa2Psk(&'a [u8; 32]),
+    WpaPsk(&'a str),
+    // WpaEap(todo!()),
 }
 
 impl<'a> From<&'a str> for WifiAuthentication<'a> {
     fn from(s: &'a str) -> Self {
-        Self::Wpa2Passphrase(s)
+        Self::WpaPsk(s)
     }
 }
 
@@ -106,8 +106,8 @@ impl<'a> ConnectionOptions<'a> {
         self
     }
 
-    pub fn wpa2_passphrase(mut self, password: &'a str) -> Self {
-        self.auth = WifiAuthentication::Wpa2Passphrase(password);
+    pub fn wpa_psk(mut self, passphrase: &'a str) -> Self {
+        self.auth = WifiAuthentication::WpaPsk(passphrase);
         self
     }