foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

fix(cli): don't panic when mapping unknown errors (#12659)

Browse source 
Instead fallback to generic "Error" class, fixes #12590, also update WPT expectations
This commit is contained in:
Aaron O'Mullan 2021-11-07 15:33:56 +01:00 committed by GitHub
parent ed761bf83f
commit 0f8299d011
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cli/errors.rs
View file

@ -70,12 +70,13 @@ pub(crate) fn get_error_class_name(e: &AnyError) -> &'static str {
.map(get_resolution_error_class) .map(get_resolution_error_class)
}) })
.unwrap_or_else(|| { .unwrap_or_else(|| {
panic!( eprintln!(
"Error '{}' contains boxed error of unknown type:{}", "Error '{}' contains boxed error of unknown type:{}",
e, e,
e.chain() e.chain()
.map(|e| format!("\n {:?}", e)) .map(|e| format!("\n {:?}", e))
.collect::<String>() .collect::<String>()
); );
"Error"
}) })
} }

42
tools/wpt/expectation.json
View file

@ -3089,8 +3089,46 @@
"digest.https.any.worker.html": true "digest.https.any.worker.html": true
}, },
"encrypt_decrypt": { "encrypt_decrypt": {
"aes_cbc.https.any.html": false, "aes_cbc.https.any.html": [
"aes_cbc.https.any.worker.html": false, "AES-CBC 128-bit key without encrypt usage",
"AES-CBC 192-bit key without encrypt usage",
"AES-CBC 256-bit key without encrypt usage",
"AES-CBC 128-bit key with mismatched key and algorithm",
"AES-CBC 192-bit key with mismatched key and algorithm",
"AES-CBC 256-bit key with mismatched key and algorithm",
"AES-CBC 128-bit key without decrypt usage",
"AES-CBC 192-bit key without decrypt usage",
"AES-CBC 256-bit key without decrypt usage",
"AES-CBC 128-bit key, zeroPadChar",
"AES-CBC 128-bit key, bigPadChar",
"AES-CBC 128-bit key, inconsistentPadChars",
"AES-CBC 192-bit key, zeroPadChar",
"AES-CBC 192-bit key, bigPadChar",
"AES-CBC 192-bit key, inconsistentPadChars",
"AES-CBC 256-bit key, zeroPadChar",
"AES-CBC 256-bit key, bigPadChar",
"AES-CBC 256-bit key, inconsistentPadChars"
],
"aes_cbc.https.any.worker.html": [
"AES-CBC 128-bit key without encrypt usage",
"AES-CBC 192-bit key without encrypt usage",
"AES-CBC 256-bit key without encrypt usage",
"AES-CBC 128-bit key with mismatched key and algorithm",
"AES-CBC 192-bit key with mismatched key and algorithm",
"AES-CBC 256-bit key with mismatched key and algorithm",
"AES-CBC 128-bit key without decrypt usage",
"AES-CBC 192-bit key without decrypt usage",
"AES-CBC 256-bit key without decrypt usage",
"AES-CBC 128-bit key, zeroPadChar",
"AES-CBC 128-bit key, bigPadChar",
"AES-CBC 128-bit key, inconsistentPadChars",
"AES-CBC 192-bit key, zeroPadChar",
"AES-CBC 192-bit key, bigPadChar",
"AES-CBC 192-bit key, inconsistentPadChars",
"AES-CBC 256-bit key, zeroPadChar",
"AES-CBC 256-bit key, bigPadChar",
"AES-CBC 256-bit key, inconsistentPadChars"
],
"aes_ctr.https.any.html": [ "aes_ctr.https.any.html": [
"AES-CTR 128-bit key", "AES-CTR 128-bit key",
"AES-CTR 192-bit key", "AES-CTR 192-bit key",