1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00

refactor(ext): align error messages (#25310)

This commit is contained in:
Ian Bull 2024-09-04 00:23:19 -07:00 committed by GitHub
parent 1ec911f173
commit cb454351d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 17 additions and 11 deletions

View file

@ -105,7 +105,7 @@ class Cache {
const reqUrl = new URL(innerRequest.url()); const reqUrl = new URL(innerRequest.url());
if (reqUrl.protocol !== "http:" && reqUrl.protocol !== "https:") { if (reqUrl.protocol !== "http:" && reqUrl.protocol !== "https:") {
throw new TypeError( throw new TypeError(
"Request url protocol must be 'http:' or 'https:'", `Request url protocol must be 'http:' or 'https:': received '${reqUrl.protocol}'`,
); );
} }
if (innerRequest.method !== "GET") { if (innerRequest.method !== "GET") {

2
ext/cache/lib.rs vendored
View file

@ -211,7 +211,7 @@ where
state.put(cache); state.put(cache);
Ok(state.borrow::<CA>().clone()) Ok(state.borrow::<CA>().clone())
} else { } else {
Err(type_error("CacheStorage is not available in this context.")) Err(type_error("CacheStorage is not available in this context"))
} }
} }

View file

@ -307,7 +307,9 @@ function processImage(input, width, height, sx, sy, sw, sh, options) {
} }
if (options.colorSpaceConversion === "none") { if (options.colorSpaceConversion === "none") {
throw new TypeError("options.colorSpaceConversion 'none' is not supported"); throw new TypeError(
"Cannot create image: invalid colorSpaceConversion option, 'none' is not supported",
);
} }
/* /*

View file

@ -250,7 +250,7 @@ class UnsafePointer {
} }
} else { } else {
throw new TypeError( throw new TypeError(
"Expected ArrayBuffer, ArrayBufferView or UnsafeCallbackPrototype", `Cannot access pointer: expected 'ArrayBuffer', 'ArrayBufferView' or 'UnsafeCallbackPrototype', received ${typeof value}`,
); );
} }
if (pointer) { if (pointer) {
@ -335,7 +335,9 @@ function getTypeSizeAndAlignment(type, cache = new SafeMap()) {
const cached = cache.get(type); const cached = cache.get(type);
if (cached !== undefined) { if (cached !== undefined) {
if (cached === null) { if (cached === null) {
throw new TypeError("Recursive struct definition"); throw new TypeError(
"Cannot get pointer size: found recursive struct",
);
} }
return cached; return cached;
} }
@ -379,7 +381,7 @@ function getTypeSizeAndAlignment(type, cache = new SafeMap()) {
case "isize": case "isize":
return [8, 8]; return [8, 8];
default: default:
throw new TypeError(`Unsupported type: ${type}`); throw new TypeError(`Cannot get pointer size, unsupported type: ${type}`);
} }
} }
@ -395,7 +397,7 @@ class UnsafeCallback {
constructor(definition, callback) { constructor(definition, callback) {
if (definition.nonblocking) { if (definition.nonblocking) {
throw new TypeError( throw new TypeError(
"Invalid UnsafeCallback, cannot be nonblocking", "Cannot construct UnsafeCallback: cannot be nonblocking",
); );
} }
const { 0: rid, 1: pointer } = op_ffi_unsafe_callback_create( const { 0: rid, 1: pointer } = op_ffi_unsafe_callback_create(
@ -467,7 +469,7 @@ class DynamicLibrary {
const type = symbols[symbol].type; const type = symbols[symbol].type;
if (type === "void") { if (type === "void") {
throw new TypeError( throw new TypeError(
"Foreign symbol of type 'void' is not supported.", "Foreign symbol of type 'void' is not supported",
); );
} }

View file

@ -334,7 +334,9 @@ pub fn op_ffi_call_nonblocking(
let symbols = &resource.symbols; let symbols = &resource.symbols;
*symbols *symbols
.get(&symbol) .get(&symbol)
.ok_or_else(|| type_error("Invalid FFI symbol name"))? .ok_or_else(|| {
type_error(format!("Invalid FFI symbol name: '{symbol}'"))
})?
.clone() .clone()
}; };

View file

@ -174,7 +174,7 @@ unsafe extern "C" fn deno_ffi_callback(
let tc_scope = &mut TryCatch::new(scope); let tc_scope = &mut TryCatch::new(scope);
args.run(tc_scope); args.run(tc_scope);
if tc_scope.exception().is_some() { if tc_scope.exception().is_some() {
log::error!("Illegal unhandled exception in nonblocking callback."); log::error!("Illegal unhandled exception in nonblocking callback");
} }
}); });
} }

View file

@ -300,6 +300,6 @@ fn ffi_callback_errors_test() {
assert_eq!(stdout, expected); assert_eq!(stdout, expected);
assert_eq!( assert_eq!(
stderr, stderr,
"Illegal unhandled exception in nonblocking callback.\n".repeat(3) "Illegal unhandled exception in nonblocking callback\n".repeat(3)
); );
} }