core: Use either crate instead of a custom implementation

ruffle-rs · Mar 26, 2024 · 3fb2d04 · 3fb2d04
1 parent fac585b
commit 3fb2d04
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -66,6 +66,7 @@ ttf-parser = "0.20"
 num-bigint = "0.4"
 unic-segment = "0.9.0"
 id3 = "1.13.1"
+either = "1.10.0"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies.futures]
 version = "0.3.30"

diff --git a/core/src/avm2/qname.rs b/core/src/avm2/qname.rs
@@ -1,8 +1,8 @@
 use crate::avm2::script::TranslationUnit;
 use crate::avm2::{Activation, Error, Namespace};
 use crate::context::UpdateContext;
-use crate::either::Either;
 use crate::string::{AvmString, WStr, WString};
+use either::Either;
 use gc_arena::{Collect, Mutation};
 use std::fmt::Debug;
 use swf::avm2::types::{Index, Multiname as AbcMultiname};

diff --git a/core/src/either.rs b/core/src/either.rs
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -29,7 +29,6 @@ pub mod context;
 pub mod context_menu;
 mod drawing;
 mod ecma_conversions;
-pub(crate) mod either;
 pub mod events;
 pub mod focus_tracker;
 mod font;