Replace unwrap_or() with expect() in commands/new/{command}.rs

peterhuene · Oct 1, 2019 · 0553e5c · 0553e5c
1 parent aa1acfa
commit 0553e5c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/azure-functions-sdk/src/commands/new/blob.rs b/azure-functions-sdk/src/commands/new/blob.rs
@@ -50,7 +50,7 @@ impl<'a> From<&'a ArgMatches<'a>> for Blob<'a> {
         Blob {
             name: args.value_of("positional-name").unwrap_or_else(|| {
                 args.value_of("name")
-                    .unwrap_or("Default fallback - never reached")
+                    .expect("A NAME argument is needed")
             }),
             path: args.value_of("path").unwrap(),
         }

diff --git a/azure-functions-sdk/src/commands/new/cosmos_db.rs b/azure-functions-sdk/src/commands/new/cosmos_db.rs
@@ -70,7 +70,7 @@ impl<'a> From<&'a ArgMatches<'a>> for CosmosDb<'a> {
         CosmosDb {
             name: args.value_of("positional-name").unwrap_or_else(|| {
                 args.value_of("name")
-                    .unwrap_or("Default fallback - never reached")
+                    .expect("A NAME argument is needed")
             }),
             connection: args.value_of("connection").unwrap(),
             database: args.value_of("database").unwrap(),

diff --git a/azure-functions-sdk/src/commands/new/event_grid.rs b/azure-functions-sdk/src/commands/new/event_grid.rs
@@ -40,7 +40,7 @@ impl<'a> From<&'a ArgMatches<'a>> for EventGrid<'a> {
         EventGrid {
             name: args.value_of("positional-name").unwrap_or_else(|| {
                 args.value_of("name")
-                    .unwrap_or("Default fallback - never reached")
+                    .expect("A NAME argument is needed")
             }),
         }
     }

diff --git a/azure-functions-sdk/src/commands/new/event_hub.rs b/azure-functions-sdk/src/commands/new/event_hub.rs
@@ -59,7 +59,7 @@ impl<'a> From<&'a ArgMatches<'a>> for EventHub<'a> {
         EventHub {
             name: args.value_of("positional-name").unwrap_or_else(|| {
                 args.value_of("name")
-                    .unwrap_or("Default fallback - never reached")
+                    .expect("A NAME argument is needed")
             }),
             connection: args.value_of("connection").unwrap(),
             hub_name: args.value_of("hub_name").unwrap_or(""),

diff --git a/azure-functions-sdk/src/commands/new/http.rs b/azure-functions-sdk/src/commands/new/http.rs
@@ -49,7 +49,7 @@ impl<'a> From<&'a ArgMatches<'a>> for Http<'a> {
         Http {
             name: args.value_of("positional-name").unwrap_or_else(|| {
                 args.value_of("name")
-                    .unwrap_or("Default fallback - never reached")
+                    .expect("A NAME argument is needed")
             }),
             auth_level: match args.value_of("auth-level") {
                 Some(level) => {

diff --git a/azure-functions-sdk/src/commands/new/queue.rs b/azure-functions-sdk/src/commands/new/queue.rs
@@ -78,7 +78,7 @@ impl<'a> From<&'a ArgMatches<'a>> for Queue<'a> {
         Queue {
             name: args.value_of("positional-name").unwrap_or_else(|| {
                 args.value_of("name")
-                    .unwrap_or("Default fallback - never reached")
+                    .expect("A NAME argument is needed")
             }),
             queue_name: args.value_of("queue_name").unwrap(),
         }

diff --git a/azure-functions-sdk/src/commands/new/service_bus.rs b/azure-functions-sdk/src/commands/new/service_bus.rs
@@ -83,7 +83,7 @@ impl<'a> From<&'a ArgMatches<'a>> for ServiceBus<'a> {
         ServiceBus {
             name: args.value_of("positional-name").unwrap_or_else(|| {
                 args.value_of("name")
-                    .unwrap_or("Default fallback - never reached")
+                    .expect("A NAME argument is needed")
             }),
             connection: args.value_of("connection").unwrap(),
             queue: args.value_of("queue"),

diff --git a/azure-functions-sdk/src/commands/new/timer.rs b/azure-functions-sdk/src/commands/new/timer.rs
@@ -50,7 +50,7 @@ impl<'a> From<&'a ArgMatches<'a>> for Timer<'a> {
         Timer {
             name: args.value_of("positional-name").unwrap_or_else(|| {
                 args.value_of("name")
-                    .unwrap_or("Default fallback - never reached")
+                    .expect("A NAME argument is needed")
             }),
             schedule: args.value_of("schedule").unwrap(),
         }