From b2adac0cf310e2e3587826e54e249c7030fdb221 Mon Sep 17 00:00:00 2001
From: Adenilson Cavalcanti <a.cavalcanti@sisa.samsung.com>
Date: Mon, 18 Nov 2013 03:22:46 -0800
Subject: [PATCH 1/2] Implemeting help message for servo browser app using
 groups::opts module.

Signed-off-by: Adenilson Cavalcanti <a.cavalcanti@sisa.samsung.com>
---
 src/components/gfx/opts.rs | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/gfx/opts.rs b/src/components/gfx/opts.rs
index 108f6feb651..3b6cd3bc61a 100644
--- a/src/components/gfx/opts.rs
+++ b/src/components/gfx/opts.rs
@@ -7,7 +7,7 @@
 
 use azure::azure_hl::{BackendType, CairoBackend, CoreGraphicsBackend};
 use azure::azure_hl::{CoreGraphicsAcceleratedBackend, Direct2DBackend, SkiaBackend};
-use extra::getopts;
+use extra::getopts::groups;
 
 /// Global flags for Servo, currently set on the command line.
 #[deriving(Clone)]
@@ -41,26 +41,40 @@ pub struct Opts {
     headless: bool,
 }
 
+fn print_usage(opts: &[groups::OptGroup]) {
+    let message = format!("Usage: ./servo [ options ... ] [URL]\n\twhere options include");
+    println(groups::usage(message, opts));
+}
+
 pub fn from_cmdline_args(args: &[~str]) -> Opts {
     let args = args.tail();
 
     let opts = ~[
-        getopts::optflag("c"),      // CPU rendering
-        getopts::optopt("o"),       // output file
-        getopts::optopt("r"),       // rendering backend
-        getopts::optopt("s"),       // size of tiles
-        getopts::optopt("t"),       // threads to render with
-        getopts::optflagopt("p"),   // profiler flag and output interval
-        getopts::optflag("x"),      // exit after load flag
-        getopts::optflag("z"),      // headless mode
+        groups::optflag("c", "cpu", "CPU rendering"),
+        groups::optopt("o", "output", "Output file", "output.png"),
+        groups::optopt("r", "rendering", "Rendering backend", "direct2d|core-graphics|core-graphics-accelerated|cairo|skia."),
+        groups::optopt("s", "size", "Size of tiles", "512"),
+        groups::optopt("t", "threads", "Number of render threads", "1"),
+        groups::optflagopt("p", "profile", "Profiler flag and output interval", "10"),
+        groups::optflag("x", "exit", "Exit after load flag"),
+        groups::optflag("z", "headless", "Headless mode"),
+        groups::optflag("h", "help", "Print this message")
     ];
 
-    let opt_match = match getopts::getopts(args, opts) {
+    let opt_match = match groups::getopts(args, opts) {
         Ok(m) => m,
         Err(f) => fail!(f.to_err_msg()),
     };
 
+    if opt_match.opt_present("h") || opt_match.opt_present("help") {
+        print_usage(opts);
+        // TODO: how to return a null struct and let the caller know that
+        // it should abort?
+        fail!("")
+    };
+
     let urls = if opt_match.free.is_empty() {
+        print_usage(opts);
         fail!(~"servo asks that you provide 1 or more URLs")
     } else {
         opt_match.free.clone()

From adaa6435ed33a032de739543df761bc205bec80e Mon Sep 17 00:00:00 2001
From: Adenilson Cavalcanti <a.cavalcanti@sisa.samsung.com>
Date: Mon, 18 Nov 2013 12:52:03 -0800
Subject: [PATCH 2/2] Following suggestion in the merge request, reuse the
 parameter passed to the function that has the application name (so in future,
 if the browser no longer is named 'servo', the code will continue to work
 fine).

Signed-off-by: Adenilson Cavalcanti <a.cavalcanti@sisa.samsung.com>
---
 src/components/gfx/opts.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/gfx/opts.rs b/src/components/gfx/opts.rs
index 3b6cd3bc61a..8ed3e9aa50e 100644
--- a/src/components/gfx/opts.rs
+++ b/src/components/gfx/opts.rs
@@ -41,12 +41,13 @@ pub struct Opts {
     headless: bool,
 }
 
-fn print_usage(opts: &[groups::OptGroup]) {
-    let message = format!("Usage: ./servo [ options ... ] [URL]\n\twhere options include");
+fn print_usage(app: &str, opts: &[groups::OptGroup]) {
+    let message = format!("Usage: {} [ options ... ] [URL]\n\twhere options include", app);
     println(groups::usage(message, opts));
 }
 
 pub fn from_cmdline_args(args: &[~str]) -> Opts {
+    let app_name = args[0].to_str();
     let args = args.tail();
 
     let opts = ~[
@@ -67,14 +68,14 @@ pub fn from_cmdline_args(args: &[~str]) -> Opts {
     };
 
     if opt_match.opt_present("h") || opt_match.opt_present("help") {
-        print_usage(opts);
+        print_usage(app_name, opts);
         // TODO: how to return a null struct and let the caller know that
         // it should abort?
         fail!("")
     };
 
     let urls = if opt_match.free.is_empty() {
-        print_usage(opts);
+        print_usage(app_name, opts);
         fail!(~"servo asks that you provide 1 or more URLs")
     } else {
         opt_match.free.clone()