Use opts as a global, to avoid cloning and passing the struct all over the code.

2 files changed, 8 insertions, 11 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 132d0314558..64411f478c8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -62,8 +62,9 @@ use std::rc::Rc;
 use std::task::TaskBuilder;
 
 #[cfg(not(test))]
-pub fn run<Window: WindowMethods>(opts: opts::Opts, window: Option<Rc<Window>>) {
-    ::servo_util::opts::set_experimental_enabled(opts.enable_experimental);
+pub fn run<Window: WindowMethods>(window: Option<Rc<Window>>) {
+    ::servo_util::opts::set_experimental_enabled(opts::get().enable_experimental);
+    let opts = opts::get();
     RegisterBindings::RegisterProxyHandlers();
 
     let mut pool_config = green::PoolConfig::new();
@@ -77,14 +78,12 @@ pub fn run<Window: WindowMethods>(opts: opts::Opts, window: Option<Rc<Window>>)
         devtools::start_server(port)
     });
 
-    let opts_clone = opts.clone();
     let time_profiler_chan_clone = time_profiler_chan.clone();
 
     let (result_chan, result_port) = channel();
     TaskBuilder::new()
         .green(&mut pool)
         .spawn(proc() {
-        let opts = &opts_clone;
         // Create a Servo instance.
         let resource_task = new_resource_task(opts.user_agent.clone());
         // If we are emitting an output file, then we need to block on
@@ -99,7 +98,6 @@ pub fn run<Window: WindowMethods>(opts: opts::Opts, window: Option<Rc<Window>>)
         let constellation_chan = Constellation::<layout::layout_task::LayoutTask,
                                                  script::script_task::ScriptTask>::start(
                                                       compositor_chan,
-                                                      opts,
                                                       resource_task,
                                                       image_cache_task,
                                                       font_cache_task,
@@ -128,7 +126,6 @@ pub fn run<Window: WindowMethods>(opts: opts::Opts, window: Option<Rc<Window>>)
 
     debug!("preparing to enter main loop");
     CompositorTask::create(window,
-                           opts,
                            compositor_port,
                            constellation_chan,
                            time_profiler_chan,
diff --git a/src/main.rs b/src/main.rs
index 9d78c0967c7..2d79d482b07 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,14 +28,14 @@ use std::os;
 #[allow(dead_code)]
 fn start(argc: int, argv: *const *const u8) -> int {
     native::start(argc, argv, proc() {
-        opts::from_cmdline_args(os::args().as_slice()).map(|opts| {
-            let window = if opts.headless {
+        if opts::from_cmdline_args(os::args().as_slice()) {
+            let window = if opts::get().headless {
                 None
             } else {
-                Some(glfw_app::create_window(&opts))
+                Some(glfw_app::create_window())
             };
-            run(opts, window);
-        });
+            run(window);
+        }
     })
 }