masonry_winit: Depend on masonry_core not masonry (linebender#1148)

Now that we don't use `masonry::theme::default_property_set()` and we
have the re-exports in place from `masonry_core`, we can remove our
dependency on `masonry` itself.

Author: waywardmonkeys

Cargo.lock

@@ -21,10 +21,10 @@ cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
 default = []
 # Enables tracing using tracy if the default Masonry tracing is used.
 # https://github.com/wolfpld/tracy can be connected to when this feature is enabled.
-tracy = ["dep:tracing-tracy", "dep:wgpu-profiler", "wgpu-profiler/tracy", "masonry/tracy"]
+tracy = ["dep:tracing-tracy", "dep:wgpu-profiler", "wgpu-profiler/tracy", "masonry_core/tracy"]
 
 [dependencies]
-masonry.workspace = true
+masonry_core.workspace = true
 wgpu.workspace = true
 winit.workspace = true
 tracing = { workspace = true, features = ["default"] }

masonry_winit/Cargo.toml

@@ -115,7 +115,7 @@ fn main() {
 }
 ```
 
-For more information, see [the documentation module](masonry::doc).
+For more information, see [the Masonry documentation][Masonry].
 
 ### Crate feature flags
 
@@ -132,6 +132,7 @@ Masonry apps currently ship with two debugging features built in:
 
 [winit]: https://crates.io/crates/winit
 [Druid]: https://crates.io/crates/druid
+[Masonry]: https://docs.rs/masonry
 [Xilem]: https://crates.io/crates/xilem
 [tracing_tracy]: https://crates.io/crates/tracing-tracy
 

masonry_winit/README.md

@@ -6,8 +6,8 @@ use std::hash::Hash;
 use std::num::NonZeroU64;
 use std::sync::atomic::{AtomicU64, Ordering};
 
-use masonry::app::RenderRoot;
-use masonry::core::{Action, Widget, WidgetId, WidgetPod};
+use masonry_core::app::RenderRoot;
+use masonry_core::core::{Action, Widget, WidgetId, WidgetPod};
 use tracing::field::DisplayValue;
 use winit::event_loop::ActiveEventLoop;
 use winit::window::{Window as WindowHandle, WindowAttributes};

masonry_winit/src/app_driver.rs

@@ -5,7 +5,7 @@
 // https://github.com/DioxusLabs/blitz/blob/main/packages/blitz-shell/src/convert_events.rs
 // Should be removed once https://github.com/rust-windowing/winit/pull/4026 is merged.
 
-use masonry::core::{Ime, ResizeDirection};
+use masonry_core::core::{Ime, ResizeDirection};
 use winit::event::Ime as WinitIme;
 use winit::window::ResizeDirection as WinitResizeDirection;
 

masonry_winit/src/convert_winit_event.rs

@@ -9,13 +9,13 @@ use std::sync::mpsc::Sender;
 use std::sync::{Arc, mpsc};
 
 use accesskit_winit::Adapter;
-use masonry::app::{RenderRoot, RenderRootOptions, RenderRootSignal, WindowSizePolicy};
-use masonry::core::{DefaultProperties, TextEvent, Widget, WidgetId, WidgetPod, WindowEvent};
-use masonry::kurbo::Affine;
-use masonry::peniko::Color;
-use masonry::util::Instant;
-use masonry::vello::util::{RenderContext, RenderSurface};
-use masonry::vello::{AaConfig, AaSupport, RenderParams, Renderer, RendererOptions, Scene};
+use masonry_core::app::{RenderRoot, RenderRootOptions, RenderRootSignal, WindowSizePolicy};
+use masonry_core::core::{DefaultProperties, TextEvent, Widget, WidgetId, WidgetPod, WindowEvent};
+use masonry_core::kurbo::Affine;
+use masonry_core::peniko::Color;
+use masonry_core::util::Instant;
+use masonry_core::vello::util::{RenderContext, RenderSurface};
+use masonry_core::vello::{AaConfig, AaSupport, RenderParams, Renderer, RendererOptions, Scene};
 use tracing::{debug, error, info, info_span};
 use ui_events_winit::{WindowEventReducer, WindowEventTranslation};
 use wgpu::PresentMode;
@@ -32,7 +32,7 @@ use crate::app_driver::WindowId;
 pub enum MasonryUserEvent {
     AccessKit(HandleId, accesskit_winit::WindowEvent),
     // TODO: A more considered design here
-    Action(WindowId, masonry::core::Action, WidgetId),
+    Action(WindowId, masonry_core::core::Action, WidgetId),
 }
 
 impl From<accesskit_winit::Event> for MasonryUserEvent {
@@ -177,7 +177,7 @@ pub fn run_with(
     // already been set, we get an error which we swallow.
     // By now, we're about to take control of the event loop. The user is unlikely
     // to try to set their own subscriber once the event loop has started.
-    let _ = masonry::app::try_init_tracing();
+    let _ = masonry_core::app::try_init_tracing();
 
     let mut main_state = MainState {
         masonry_state: MasonryState::new(event_loop.create_proxy(), windows, default_properties),

masonry_winit/src/event_loop_runner.rs

@@ -93,7 +93,7 @@
 //! }
 //! ```
 //!
-//! For more information, see [the documentation module](masonry::doc).
+//! For more information, see [the Masonry documentation][Masonry].
 //!
 //! ### Crate feature flags
 //!
@@ -110,6 +110,7 @@
 //!
 //! [winit]: https://crates.io/crates/winit
 //! [Druid]: https://crates.io/crates/druid
+//! [Masonry]: https://docs.rs/masonry
 //! [Xilem]: https://crates.io/crates/xilem
 //! [tracing_tracy]: https://crates.io/crates/tracing-tracy
 // TODO: Add screenshot. This can't use include_screenshot as that doesn't work with cargo-rdme