# HG changeset patch
# User AnaTofuZ <anatofuz@gmail.com>
# Date 1604396283 -32400
# Node ID da27437a94b0a87036a5c79ae84875307db59aad
# Parent  e8ba0f63c227816541ad5f117b8836baccadd825# Parent  0ee235caebc5b6697721032c6458a7662f6f3c2b
Merge remote-tracking branch 'self/master'

diff -r e8ba0f63c227 -r da27437a94b0 src/command.rs
--- a/src/command.rs	Tue Nov 03 18:37:04 2020 +0900
+++ b/src/command.rs	Tue Nov 03 18:38:03 2020 +0900
@@ -101,4 +101,4 @@
         return vm_name.to_string();
     }
     format!("{}-{}", user_name, vm_name)
-}
\ No newline at end of file
+}
diff -r e8ba0f63c227 -r da27437a94b0 src/main.rs
--- a/src/main.rs	Tue Nov 03 18:37:04 2020 +0900
+++ b/src/main.rs	Tue Nov 03 18:38:03 2020 +0900
@@ -18,7 +18,7 @@
     Console(Console),
     Start(Start),
     Ttyconsole(TTyconsole),
-    VNCDisplay(VNCDisplay),
+    Vncdisplay(Vncdisplay),
     Dumpxml(Dumpxml),
     DefineGDB(DefineGDB),
     Domiflist(Domiflist),
@@ -45,7 +45,7 @@
 
 /// vncdisplay
 #[derive(Clap)]
-struct VNCDisplay {
+struct Vncdisplay {
     name: String,
 }
 
@@ -145,7 +145,7 @@
             command::destroy(&user_name, arg.name);
         }
 
-        SubCommand::VNCDisplay(arg) => {
+        SubCommand::Vncdisplay(arg) => {
             user::set_root_id();
             command::vncdisplay(&user_name, arg.name);
         }
diff -r e8ba0f63c227 -r da27437a94b0 src/xml.rs
--- a/src/xml.rs	Tue Nov 03 18:37:04 2020 +0900
+++ b/src/xml.rs	Tue Nov 03 18:38:03 2020 +0900
@@ -153,7 +153,6 @@
         print!("vnc password : {}\n", self.VNCPassword);
         Ok(self.XMLPATH)
     }
-
 }
 
 fn generate_pw() -> String {