diff options
author | CYBAI <cyb.ai.815@gmail.com> | 2020-01-19 19:44:59 +0900 |
---|---|---|
committer | CYBAI <cyb.ai.815@gmail.com> | 2020-01-20 19:18:12 +0900 |
commit | 33988cd8aa49acea30611aef35c29faae9ae5160 (patch) | |
tree | 7b5fe1d8203970ea552013590a648a80bf6d1087 /components/script/script_module.rs | |
parent | 2a594821ba44ba2c13e9a39c6fd8c5a450bd06f4 (diff) | |
download | servo-33988cd8aa49acea30611aef35c29faae9ae5160.tar.gz servo-33988cd8aa49acea30611aef35c29faae9ae5160.zip |
Return the highest priority error from the descendant instead of return the very first one
Diffstat (limited to 'components/script/script_module.rs')
-rw-r--r-- | components/script/script_module.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/script_module.rs b/components/script/script_module.rs index 4bb60f5a233..6eb89dd1ba0 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -633,6 +633,7 @@ impl ModuleTree { } // 5-6. + let mut errors: Vec<ModuleError> = Vec::new(); let descendant_urls = module_tree.get_descendant_urls().borrow(); for descendant_module in descendant_urls @@ -650,13 +651,13 @@ impl ModuleTree { ModuleTree::find_first_parse_error(&global, &descendant_module, discovered_urls); // 8-4. - if child_parse_error.is_some() { - return child_parse_error; + if let Some(child_error) = child_parse_error { + errors.push(child_error); } } // Step 9. - return None; + return errors.into_iter().max(); } } |