Merge branch 'upstream' into simplify-native-core

packages/native-core/src/lib.rs

@@ -1,11 +1,11 @@
+use std::any::Any;
 use std::hash::BuildHasherDefault;
 
 pub use node_ref::NodeMask;
 pub use passes::AnyMapLike;
 pub use passes::{Dependancy, Pass, TypeErasedPass};
 use rustc_hash::FxHasher;
-pub use state::State;
-pub use tree::NodeId;
+use tree::NodeId;
 
 pub mod layout_attributes;
 pub mod node;
@@ -18,7 +18,7 @@ pub mod utils;
 
 pub type FxDashMap<K, V> = dashmap::DashMap<K, V, BuildHasherDefault<FxHasher>>;
 pub type FxDashSet<K> = dashmap::DashSet<K, BuildHasherDefault<FxHasher>>;
-pub type SendAnyMap = anymap::Map<dyn anymap::any::Any + Send + Sync + 'static>;
+pub type SendAnyMap = anymap::Map<dyn Any + Send + Sync + 'static>;
 
 /// Used in derived state macros
 #[derive(Eq, PartialEq)]