From 9f961e9c1668b6dd60b75ff30ffdb2e7e36e3eba Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sun, 23 Jul 2023 11:42:35 +0200 Subject: [PATCH] Rename Either types to OneOfN --- crates/xilem_html/src/lib.rs | 4 +-- .../xilem_html/src/{either.rs => one_of.rs} | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) rename crates/xilem_html/src/{either.rs => one_of.rs} (96%) diff --git a/crates/xilem_html/src/lib.rs b/crates/xilem_html/src/lib.rs index 152bc1e9..ce46d7ea 100644 --- a/crates/xilem_html/src/lib.rs +++ b/crates/xilem_html/src/lib.rs @@ -10,9 +10,9 @@ use wasm_bindgen::JsCast; mod app; mod class; mod context; -mod either; mod element; mod event; +mod one_of; mod view; #[cfg(feature = "typed")] mod view_ext; @@ -22,13 +22,13 @@ pub use xilem_core::MessageResult; pub use app::App; pub use class::class; pub use context::{ChangeFlags, Cx}; -pub use either::{Either, Either3, Either4, Either5, Either6, Either7, Either8}; #[cfg(feature = "typed")] pub use element::elements; pub use element::{element, Element, ElementState}; #[cfg(feature = "typed")] pub use event::events; pub use event::{on_event, Action, Event, OnEvent, OnEventState, OptionalAction}; +pub use one_of::{OneOf2, OneOf3, OneOf4, OneOf5, OneOf6, OneOf7, OneOf8}; pub use view::{ Adapt, AdaptState, AdaptThunk, AnyView, Memoize, Pod, View, ViewMarker, ViewSequence, }; diff --git a/crates/xilem_html/src/either.rs b/crates/xilem_html/src/one_of.rs similarity index 96% rename from crates/xilem_html/src/either.rs rename to crates/xilem_html/src/one_of.rs index f19b820b..0dd1dfe4 100644 --- a/crates/xilem_html/src/either.rs +++ b/crates/xilem_html/src/one_of.rs @@ -2,7 +2,7 @@ use wasm_bindgen::throw_str; use crate::{ChangeFlags, Cx, Pod, View, ViewMarker, ViewSequence}; -macro_rules! either { +macro_rules! one_of { ( #[doc = $first_doc_line:literal] $ident:ident { $( $vars:ident ),+ } @@ -190,36 +190,36 @@ macro_rules! either { }; } -either! { +one_of! { /// This view container can switch between two views. - Either { A, B } + OneOf2 { A, B } } -either! { +one_of! { /// This view container can switch between three views. - Either3 { A, B, C } + OneOf3 { A, B, C } } -either! { +one_of! { /// This view container can switch between four views. - Either4 { A, B, C, D } + OneOf4 { A, B, C, D } } -either! { +one_of! { /// This view container can switch between five views. - Either5 { A, B, C, D, E } + OneOf5 { A, B, C, D, E } } -either! { +one_of! { /// This view container can switch between six views. - Either6 { A, B, C, D, E, F } + OneOf6 { A, B, C, D, E, F } } -either! { +one_of! { /// This view container can switch between seven views. - Either7 { A, B, C, D, E, F, G } + OneOf7 { A, B, C, D, E, F, G } } -either! { +one_of! { /// This view container can switch between eight views. - Either8 { A, B, C, D, E, F, G, H } + OneOf8 { A, B, C, D, E, F, G, H } }