mirror of
https://github.com/servo/servo.git
synced 2025-08-02 04:00:32 +01:00
script: Take away Fallible from new_resolved and new_rejected (#35473)
* script: Take away Fallible from new_resolved and new_rejected Both Promise::new_resolved and new_rejected only return `Ok`. We don't need them to be fallible. Simply return `Rc<Promise>`, instead of `Fallible<Rc<Promise>>`. Also, clean up relevant code. Signed-off-by: Kingsley Yung <kingsley@kkoyung.dev> * script: pull_algorithm becomes infallible The method pull_algorithm only returns `Some(Ok(_))`, which means it is infallible. Clean up the returned type. Signed-off-by: Kingsley Yung <kingsley@kkoyung.dev> * script: generic_initialize becomes infallible The method generic_initialize only returns `Ok(())`, which means it is infallible. Clean up the returned type. Signed-off-by: Kingsley Yung <kingsley@kkoyung.dev> --------- Signed-off-by: Kingsley Yung <kingsley@kkoyung.dev>
This commit is contained in:
parent
3421185737
commit
b4f48c561b
9 changed files with 23 additions and 44 deletions
|
@ -23,12 +23,7 @@ use crate::script_runtime::CanGc;
|
|||
pub(crate) trait ReadableStreamGenericReader {
|
||||
/// <https://streams.spec.whatwg.org/#readable-stream-reader-generic-initialize>
|
||||
#[cfg_attr(crown, allow(crown::unrooted_must_root))]
|
||||
fn generic_initialize(
|
||||
&self,
|
||||
global: &GlobalScope,
|
||||
stream: &ReadableStream,
|
||||
can_gc: CanGc,
|
||||
) -> Fallible<()> {
|
||||
fn generic_initialize(&self, global: &GlobalScope, stream: &ReadableStream, can_gc: CanGc) {
|
||||
// Set reader.[[stream]] to stream.
|
||||
self.set_stream(Some(stream));
|
||||
|
||||
|
@ -50,7 +45,7 @@ pub(crate) trait ReadableStreamGenericReader {
|
|||
// Otherwise, if stream.[[state]] is "closed",
|
||||
// Set reader.[[closedPromise]] to a promise resolved with undefined.
|
||||
let cx = GlobalScope::get_cx();
|
||||
self.set_closed_promise(Promise::new_resolved(global, cx, ())?);
|
||||
self.set_closed_promise(Promise::new_resolved(global, cx, ()));
|
||||
} else {
|
||||
// Assert: stream.[[state]] is "errored"
|
||||
assert!(stream.is_errored());
|
||||
|
@ -59,13 +54,11 @@ pub(crate) trait ReadableStreamGenericReader {
|
|||
let cx = GlobalScope::get_cx();
|
||||
rooted!(in(*cx) let mut error = UndefinedValue());
|
||||
stream.get_stored_error(error.handle_mut());
|
||||
self.set_closed_promise(Promise::new_rejected(global, cx, error.handle())?);
|
||||
self.set_closed_promise(Promise::new_rejected(global, cx, error.handle()));
|
||||
|
||||
// Set reader.[[closedPromise]].[[PromiseIsHandled]] to true
|
||||
self.get_closed_promise().set_promise_is_handled();
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// <https://streams.spec.whatwg.org/#readable-stream-reader-generic-cancel>
|
||||
|
@ -107,9 +100,11 @@ pub(crate) trait ReadableStreamGenericReader {
|
|||
error.handle_mut(),
|
||||
);
|
||||
|
||||
self.set_closed_promise(
|
||||
Promise::new_rejected(&stream.global(), cx, error.handle()).unwrap(),
|
||||
);
|
||||
self.set_closed_promise(Promise::new_rejected(
|
||||
&stream.global(),
|
||||
cx,
|
||||
error.handle(),
|
||||
));
|
||||
}
|
||||
// Set reader.[[closedPromise]].[[PromiseIsHandled]] to true.
|
||||
self.get_closed_promise().set_promise_is_handled();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue