aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/testrunner.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2024-12-11 00:52:48 -0500
committerGitHub <noreply@github.com>2024-12-11 05:52:48 +0000
commite0cbab2fbb58ac687fb3df1bb56a27e748210bbb (patch)
tree5c331274b24c62842cd31cfdefe80b29120273dd /components/script/dom/testrunner.rs
parente10e989abb884f3c83a5c35d4c1b1be887ec0bb1 (diff)
downloadservo-e0cbab2fbb58ac687fb3df1bb56a27e748210bbb.tar.gz
servo-e0cbab2fbb58ac687fb3df1bb56a27e748210bbb.zip
Rewrite From/TryFrom conversions on generated types to avoid future orphan rule violations (#34554)
* script: Add traits to allow converting between types that are not defined in the script crate. Signed-off-by: Josh Matthews <josh@joshmatthews.net> * script: Rewrite all From/TryFrom implementations on generated WebIDL types to use new Convert/TryConvert traits. Signed-off-by: Josh Matthews <josh@joshmatthews.net> --------- Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Diffstat (limited to 'components/script/dom/testrunner.rs')
-rw-r--r--components/script/dom/testrunner.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/testrunner.rs b/components/script/dom/testrunner.rs
index ae62777bab7..701884f2844 100644
--- a/components/script/dom/testrunner.rs
+++ b/components/script/dom/testrunner.rs
@@ -7,8 +7,9 @@ use dom_struct::dom_struct;
use ipc_channel::ipc::IpcSender;
use profile_traits::ipc;
+use crate::conversions::Convert;
use crate::dom::bindings::codegen::Bindings::TestRunnerBinding::TestRunnerMethods;
-use crate::dom::bindings::error::{Error, ErrorResult};
+use crate::dom::bindings::error::ErrorResult;
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::DomRoot;
use crate::dom::bindings::str::DOMString;
@@ -46,7 +47,7 @@ impl TestRunnerMethods<crate::DomTypeHolder> for TestRunner {
.unwrap();
match receiver.recv().unwrap() {
Ok(()) => Ok(()),
- Err(error) => Err(Error::from(error)),
+ Err(error) => Err(error.convert()),
}
}
}