Add testing for prefs

Also, spelling fix in opts.rs

Fix order of imports to satisfy the lint
Fix split line in test
Fix multi-line string
This commit is contained in:
Matthew Bentley 2016-03-21 22:39:20 -04:00
parent 3b93c9dde9
commit d06def01ff
4 changed files with 47 additions and 2 deletions

View file

@ -801,7 +801,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
// These must happen after setting the default options, since the prefs rely on
// on the resource path.
// Note that command line preferences have the highest precedent
// Note that command line preferences have the highest precedence
if get().profile_dir.is_some() {
prefs::add_user_prefs();
}

View file

@ -2,9 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use opts;
use resource_files::resources_dir_path;
use rustc_serialize::json::{Json, ToJson};
use opts;
use std::borrow::ToOwned;
use std::collections::HashMap;
use std::fs::File;