Merge pull request #201 from nicklan/fix-missing-expires-crash

src/completer.rs

@@ -158,11 +158,11 @@ impl ClickHelper {
             if let Some(ref env) = self.env {
                 match last_opt {
                     Some(opt) => {
-                        let opts = cmd.try_completed_named(pos, opt, prefix, &*env);
+                        let opts = cmd.try_completed_named(pos, opt, prefix, env);
                         (cmd_len, opts)
                     }
                     None => {
-                        let opts = cmd.try_complete(pos, prefix, &*env);
+                        let opts = cmd.try_complete(pos, prefix, env);
                         (cmd_len, opts)
                     }
                 }

src/config/click.rs

@@ -22,13 +22,13 @@ use std::io::Read;
 
 use crate::error::ClickError;
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct Alias {
     pub alias: String,
     pub expanded: String,
 }
 
-#[derive(PartialEq, Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub enum EditMode {
     Emacs,
     Vi,
@@ -59,7 +59,7 @@ impl From<&EditMode> for String {
     }
 }
 
-#[derive(PartialEq, Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub enum CompletionType {
     Circular,
     List,

src/config/kubefile.rs

@@ -228,12 +228,16 @@ impl AuthProviderConfig {
     }
 }
 
+fn default_none() -> Option<SystemTime> {
+    None
+}
+
 #[serde_with::serde_as]
 #[derive(PartialEq, Debug, Deserialize, Clone)]
 struct AuthProviderAzureConfig {
     #[serde(rename = "access-token")]
     access_token: Option<String>,
-    #[serde(rename = "expires-on")]
+    #[serde(rename = "expires-on", default = "default_none")]
     #[serde_as(as = "Option<TimestampSeconds<String,Flexible>>")]
     expires_on: Option<SystemTime>,
 }
@@ -438,15 +442,15 @@ impl AuthProviderGcpConfig {
     }
 }
 
-#[derive(PartialEq, Debug, Deserialize, Clone)]
+#[derive(Eq, PartialEq, Debug, Deserialize, Clone)]
 pub struct NameValue {
     name: String,
     value: String,
 }
 
 /// config for running a command, as defined here:
 /// https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/types.go#L183
-#[derive(PartialEq, Debug, Deserialize, Clone)]
+#[derive(Eq, PartialEq, Debug, Deserialize, Clone)]
 pub struct ExecConfig {
     command: Option<String>,
     args: Option<Vec<String>>,
@@ -504,7 +508,7 @@ impl ExecConfig {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum ExecAuth {
     Token(String),
     ClientCertKey { cert_data: String, key_data: String },

src/env.rs

@@ -46,7 +46,7 @@ pub struct ExpandedAlias<'a> {
     pub rest: &'a str,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub enum ObjectSelection {
     Single(KObj),
     Range(Vec<KObj>),

src/kobj.rs

@@ -27,7 +27,7 @@ use serde_json::Value;
 
 use std::io::Write;
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum ObjType {
     Pod {
         containers: Vec<String>,
@@ -53,7 +53,7 @@ pub enum ObjType {
 }
 
 /// An object we can have as a "current" thing
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct KObj {
     pub name: String,
     pub namespace: Option<String>,

src/table.rs

@@ -350,7 +350,7 @@ pub fn raw_quantity(quantity: &Quantity) -> f64 {
     }
 
     // find location of first non-digit
-    let mut split = match chars.position(|c| !c.is_digit(10)) {
+    let mut split = match chars.position(|c| !c.is_ascii_digit()) {
         Some(pos) => pos,
         None => {
             // no non digit, just parse as a raw number, set split to end of string