diff --git a/components/util/opts.rs b/components/util/opts.rs index d2599fb128d..c806e19b4a0 100644 --- a/components/util/opts.rs +++ b/components/util/opts.rs @@ -400,7 +400,7 @@ pub fn from_cmdline_args(args: &[String]) -> bool { disable_share_style_cache: debug_options.contains(&"disable-share-style-cache"), }; - set_opts(opts); + set(opts); true } @@ -423,7 +423,7 @@ pub fn experimental_enabled() -> bool { // when passing through the DOM structures. static mut OPTIONS: *mut Opts = 0 as *mut Opts; -pub fn set_opts(opts: Opts) { +pub fn set(opts: Opts) { unsafe { assert!(OPTIONS.is_null()); let box_opts = box opts; @@ -439,7 +439,7 @@ pub fn get<'a>() -> &'a Opts { // set of options. This is mostly useful for unit tests that // run through a code path which queries the cmd line options. if OPTIONS == ptr::null_mut() { - set_opts(default_opts()); + set(default_opts()); } mem::transmute(OPTIONS) } diff --git a/ports/cef/core.rs b/ports/cef/core.rs index da964455ddc..02f884e3c71 100644 --- a/ports/cef/core.rs +++ b/ports/cef/core.rs @@ -78,7 +78,7 @@ pub extern "C" fn cef_initialize(args: *const cef_main_args_t, temp_opts.hard_fail = false; temp_opts.enable_text_antialiasing = true; temp_opts.resources_path = resources_path(); - opts::set_opts(temp_opts); + opts::set(temp_opts); return 1 }