mirror of
https://github.com/servo/servo.git
synced 2025-09-29 16:19:14 +01:00
ed66e0b0ca
This includes some small refactoring and some small breaking changes as listed below. Other than these I tried to keep the functionality exactly the same but because in the old code the parsing and settings of preferences was intermingled it was difficult to figure out. Small Breaking: - Size and resources-path were unused but appeared in the help. - soft-fail and hard-fail: Soft-fail flag got removed because it is too difficult to keep both. The default is now soft-fail and hard-fail can be enabled. - The help strings are obviously formatted differently now. - -V does not work anymore but -v and --version. Ideally, we want to have the ServoShellPreferences and Preferences be directly the Argument structure but that needs a bit more discussion because it would break backwards compatibility with the commandline. This increases the binary size by ~280kb. Testing: The testcases are still working but they do not cover much. I added a unit test for the -p flag because it is the most difficult to parse in general. Fixes: This will fix a small number of various parsing misshaps. It will also show if we are removing an option via unused lint. Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
48 lines
1.7 KiB
Rust
48 lines
1.7 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use std::{env, panic};
|
|
|
|
use crate::desktop::app::App;
|
|
use crate::desktop::events_loop::EventsLoop;
|
|
use crate::panic_hook;
|
|
use crate::prefs::{ArgumentParsingResult, parse_command_line_arguments};
|
|
|
|
pub fn main() {
|
|
crate::crash_handler::install();
|
|
crate::init_crypto();
|
|
crate::resources::init();
|
|
|
|
// TODO: once log-panics is released, can this be replaced by
|
|
// log_panics::init()?
|
|
panic::set_hook(Box::new(panic_hook::panic_hook));
|
|
|
|
let args = env::args().collect();
|
|
let (opts, preferences, servoshell_preferences) = match parse_command_line_arguments(args) {
|
|
ArgumentParsingResult::ContentProcess(token) => return servo::run_content_process(token),
|
|
ArgumentParsingResult::ChromeProcess(opts, preferences, servoshell_preferences) => {
|
|
(opts, preferences, servoshell_preferences)
|
|
},
|
|
ArgumentParsingResult::Exit => {
|
|
std::process::exit(0);
|
|
},
|
|
ArgumentParsingResult::ErrorParsing => {
|
|
std::process::exit(1);
|
|
},
|
|
};
|
|
|
|
crate::init_tracing(servoshell_preferences.tracing_filter.as_deref());
|
|
|
|
let clean_shutdown = servoshell_preferences.clean_shutdown;
|
|
let has_output_file = servoshell_preferences.output_image_path.is_some();
|
|
let event_loop = EventsLoop::new(servoshell_preferences.headless, has_output_file)
|
|
.expect("Failed to create events loop");
|
|
|
|
{
|
|
let mut app = App::new(opts, preferences, servoshell_preferences, &event_loop);
|
|
event_loop.run_app(&mut app);
|
|
}
|
|
|
|
crate::platform::deinit(clean_shutdown)
|
|
}
|