{"push_id":1048124197,"size":4,"distinct_size":0,"ref":"refs/heads/master","head":"ea24389b85980e7099036abe33dc4837c191d141","before":"5bb38aa03b5b83dadfa675591dd8bd5cfb31a7f0","commits":[{"sha":"3b93c9dde94f371c3cde73836a4d8bff2628380c","author":{"email":"3e0c691559c551dd284b798d7d6334694d3322a2@gmail.com","name":"Matthew Bentley"},"message":"Add functionality to load prefs.json from profile-dir (as set with\n--profile-dir on launch)\n\nUse T: Read rather than File, so that read_prefs_from_file can be tested","distinct":false,"url":"https://api.github.com/repos/servo/servo/commits/3b93c9dde94f371c3cde73836a4d8bff2628380c"},{"sha":"d06def01ff760c5893527e513713bf3504b0e979","author":{"email":"3e0c691559c551dd284b798d7d6334694d3322a2@gmail.com","name":"Matthew Bentley"},"message":"Add testing for prefs\nAlso, spelling fix in opts.rs\n\nFix order of imports to satisfy the lint\nFix split line in test\nFix multi-line string","distinct":false,"url":"https://api.github.com/repos/servo/servo/commits/d06def01ff760c5893527e513713bf3504b0e979"},{"sha":"324b4d1e6db1a5e76c3702d8b39d7c8789ae9311","author":{"email":"3e0c691559c551dd284b798d7d6334694d3322a2@gmail.com","name":"Matthew Bentley"},"message":"Print errors to stderr","distinct":false,"url":"https://api.github.com/repos/servo/servo/commits/324b4d1e6db1a5e76c3702d8b39d7c8789ae9311"},{"sha":"ea24389b85980e7099036abe33dc4837c191d141","author":{"email":"1d30da7446c147361b50ba946a7897e87cc888f4@mozilla.com","name":"bors-servo"},"message":"Auto merge of #10114 - matthewbentley:master, r=Manishearth\n\nLoad prefs.json from profile-dir if --profile-dir is specified at launch\n\nIn response to #10098\nTries to load `prefs.json` from the profile-dir and merge them into the preferences if `--profile-dir` is specified at launch.  The profile-dir preferences take precedence over the default preferences, but command line preferences still take precedence over everything.\n\nAlso adds some tests for `prefs.rs`.  These rely on the contents of `resources/prefs.json` (at least `test_get_set_reset_extend()` does), so they may need to be re-worked a bit.\n\n<!-- Reviewable:start -->\n---\nThis change is [<img src=\"https://reviewable.io/review_button.svg\" height=\"35\" align=\"absmiddle\" alt=\"Reviewable\"/>](https://reviewable.io/reviews/servo/servo/10114)\n<!-- Reviewable:end -->","distinct":false,"url":"https://api.github.com/repos/servo/servo/commits/ea24389b85980e7099036abe33dc4837c191d141"}]}