Skip to content
Permalink
Browse files

util: Rename `ops::set_opts` to `ops::set`, to match `get`

  • Loading branch information
brson committed May 9, 2015
1 parent 8975a3b commit f8bbc0a9742ac5f834ee635d458b4de6cd7c0851
Showing with 4 additions and 4 deletions.
  1. +3 −3 components/util/opts.rs
  2. +1 −1 ports/cef/core.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)
}
@@ -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
}

0 comments on commit f8bbc0a

Please sign in to comment.
You can’t perform that action at this time.