mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Auto merge of #14863 - charlesvdv:prefs, r=jdm
Allow cli prefs to have numerical value I'm not sure as I'm new with servo but shouldn't the new function ```parse_opt_prefs``` be in ```prefs.rs``` instead of ```opts.rs``` ? <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14842 <!-- Either: --> - [X] There are tests for these changes OR <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14863) <!-- Reviewable:end -->
This commit is contained in:
commit
42e28bf7e5
2 changed files with 40 additions and 9 deletions
|
@ -889,14 +889,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
|
|||
prefs::add_user_prefs();
|
||||
|
||||
for pref in opt_match.opt_strs("pref").iter() {
|
||||
let split: Vec<&str> = pref.splitn(2, '=').collect();
|
||||
let pref_name = split[0];
|
||||
let value = split.get(1);
|
||||
match value {
|
||||
Some(&"false") => PREFS.set(pref_name, PrefValue::Boolean(false)),
|
||||
Some(&"true") | None => PREFS.set(pref_name, PrefValue::Boolean(true)),
|
||||
_ => PREFS.set(pref_name, PrefValue::String(value.unwrap().to_string()))
|
||||
};
|
||||
parse_pref_from_command_line(pref);
|
||||
}
|
||||
|
||||
if let Some(layout_threads) = layout_threads {
|
||||
|
@ -946,6 +939,20 @@ pub fn set_defaults(opts: Opts) {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn parse_pref_from_command_line(pref: &str) {
|
||||
let split: Vec<&str> = pref.splitn(2, '=').collect();
|
||||
let pref_name = split[0];
|
||||
let value = split.get(1);
|
||||
match value {
|
||||
Some(&"false") => PREFS.set(pref_name, PrefValue::Boolean(false)),
|
||||
Some(&"true") | None => PREFS.set(pref_name, PrefValue::Boolean(true)),
|
||||
Some(value) => match value.parse::<f64>() {
|
||||
Ok(v) => PREFS.set(pref_name, PrefValue::Number(v)),
|
||||
Err(_) => PREFS.set(pref_name, PrefValue::String(value.to_string()))
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn get() -> &'static Opts {
|
||||
&OPTIONS
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue