# HG changeset patch
# User alfadur
# Date 1555086404 -10800
# Node ID fc2cfec95d8631904328a4efd6660de143cfcbc9
# Parent  9de13d9a6312c4766b2cddfadddc60810031d245
a bit more option error handling

diff -r 9de13d9a6312 -r fc2cfec95d86 rust/hedgewars-server/src/main.rs
--- a/rust/hedgewars-server/src/main.rs	Fri Apr 12 11:47:35 2019 -0400
+++ b/rust/hedgewars-server/src/main.rs	Fri Apr 12 19:26:44 2019 +0300
@@ -3,10 +3,10 @@
 
 extern crate getopts;
 use getopts::Options;
-use std::env;
 use log::*;
 use mio::net::*;
 use mio::*;
+use std::env;
 
 mod protocol;
 mod server;
@@ -15,6 +15,8 @@
 use crate::server::network::NetworkLayer;
 use std::time::Duration;
 
+const PROGRAM_NAME: &'_ str = "Hedgewars Game Server";
+
 fn main() {
     env_logger::init();
 
@@ -24,11 +26,14 @@
     opts.optopt("p", "port", "port - defaults to 46631", "PORT");
     opts.optflag("h", "help", "help");
     let matches = match opts.parse(&args[1..]) {
-        Ok(m) => { m }
-        Err(f) => { panic!(f.to_string()) }
+        Ok(m) => m,
+        Err(e) => {
+            println!("{}\n{}", e, opts.short_usage(""));
+            return;
+        }
     };
     if matches.opt_present("h") {
-        println!("-p/--port - defaults to 46631");
+        println!("{}", opts.usage(PROGRAM_NAME));
         return;
     }
     info!("Hedgewars game server, protocol {}", utils::SERVER_VERSION);
@@ -39,8 +44,7 @@
             Some(x) => address = format!("0.0.0.0:{}", x).parse().unwrap(),
             None => address = "0.0.0.0:46631".parse().unwrap(),
         }
-    }
-    else {
+    } else {
         address = "0.0.0.0:46631".parse().unwrap();
     }