Remove ViewArgument (#1666)

Motivated by
#1638 (comment)
this PR basically reverts #1444.

Author: flosse

placehero/src/avatars.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 
 use xilem::core::one_of::Either;
 use xilem::core::{
-    MessageProxy, MessageResult, NoElement, Resource, View, ViewArgument, fork, map_message_result,
+    MessageProxy, MessageResult, NoElement, Resource, View, fork, map_message_result,
     on_action_with_context, provides, with_context,
 };
 use xilem::masonry::layout::AsUnit;
@@ -45,7 +45,7 @@ impl Avatars {
     ///
     /// Requires that this View is within a [`Self::provide`] call.
     // TODO: ArcStr for URL?
-    pub(crate) fn avatar<State: ViewArgument, Action: 'static>(
+    pub(crate) fn avatar<State: 'static, Action: 'static>(
         url: String,
     ) -> impl WidgetView<State, Action> + use<State, Action> {
         with_context(move |this: &mut Self, _| {
@@ -84,7 +84,7 @@ impl Avatars {
     ) -> impl WidgetView<State, Action, Element = Child::Element>
     where
         Child: WidgetView<State, Action>,
-        State: ViewArgument,
+        State: 'static,
         Action: 'static,
     {
         provides(
@@ -99,7 +99,7 @@ impl Avatars {
     fn worker<State, Action>()
     -> impl View<State, Action, ViewCtx, Element = NoElement> + use<State, Action>
     where
-        State: ViewArgument,
+        State: 'static,
         Action: 'static,
     {
         map_message_result(

placehero/src/components.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use megalodon::entities::Status;
-use xilem::core::{Arg, ViewArgument};
 use xilem::masonry::layout::AsUnit;
 use xilem::style::Style;
 use xilem::view::{
@@ -28,7 +27,7 @@ mod media;
 // TODO: Determine our UX for boosting/reblogging.
 // In particular, do we want to have the same design as "normal" Mastodon, where the
 // avatar for the booster is shown in the "child" avatar.
-fn base_status<State: ViewArgument>(
+fn base_status<State: 'static>(
     status: &Status,
 ) -> impl FlexSequence<State, Navigation> + use<State> {
     // TODO: This really should be Arced or something.
@@ -75,7 +74,7 @@ fn base_status<State: ViewArgument>(
             label(format!("💬 {}", status.replies_count)).flex(1.0),
             label(format!("🔄 {}", status.reblogs_count)).flex(1.0),
             label(format!("⭐ {}", status.favourites_count)).flex(1.0),
-            text_button("View Replies", move |_: Arg<'_, State>| {
+            text_button("View Replies", move |_: &mut State| {
                 Navigation::LoadContext(status_clone.clone())
             }),
         ))

placehero/src/components/media.rs

@@ -9,10 +9,7 @@ use std::{
 use megalodon::entities::{Attachment, attachment::AttachmentType};
 use xilem::{
     Blob, ImageFormat, WidgetView,
-    core::{
-        ViewArgument,
-        one_of::{OneOf, OneOf4},
-    },
+    core::one_of::{OneOf, OneOf4},
     masonry::peniko::{ImageAlphaType, ImageData},
     view::{ObjectFit, flex_col, image, prose},
 };
@@ -22,7 +19,7 @@ use crate::actions::Navigation;
 /// Render a single media attachment for use in a status.
 ///
 /// This currently doesn't perform any caching.
-pub(crate) fn attachment<State: ViewArgument>(
+pub(crate) fn attachment<State: 'static>(
     attachment: &Attachment,
 ) -> impl WidgetView<State, Navigation> + use<State> {
     match attachment.r#type {
@@ -41,7 +38,7 @@ pub(crate) fn attachment<State: ViewArgument>(
 /// This view currently does not cache the blurhash, or take any other steps to
 /// avoid recalculating the image.
 /// We haven't ran into this being a performance issue.
-fn maybe_blurhash<State: ViewArgument>(
+fn maybe_blurhash<State: 'static>(
     attachment: &Attachment,
 ) -> Option<impl WidgetView<State, Navigation> + use<State>> {
     let start = Instant::now();
@@ -90,7 +87,7 @@ fn maybe_blurhash<State: ViewArgument>(
 }
 
 /// Show some useful info for audio attachments.
-fn audio_attachment<State: ViewArgument>(
+fn audio_attachment<State: 'static>(
     attachment: &Attachment,
 ) -> impl WidgetView<State, Navigation> + use<State> {
     flex_col((
@@ -106,7 +103,7 @@ fn audio_attachment<State: ViewArgument>(
 }
 
 /// Show some useful info for audio attachments.
-fn video_attachment<State: ViewArgument>(
+fn video_attachment<State: 'static>(
     attachment: &Attachment,
 ) -> impl WidgetView<State, Navigation> + use<State> {
     flex_col((
@@ -122,7 +119,7 @@ fn video_attachment<State: ViewArgument>(
 }
 
 /// Show some useful info for audio attachments.
-fn image_attachment<State: ViewArgument>(
+fn image_attachment<State: 'static>(
     attachment: &Attachment,
 ) -> impl WidgetView<State, Navigation> + use<State> {
     flex_col((

placehero/src/components/thread.rs

@@ -3,7 +3,6 @@
 
 use megalodon::entities::{Context, Status};
 use xilem::WidgetView;
-use xilem::core::Edit;
 use xilem::masonry::layout::AsUnit;
 use xilem::masonry::util::debug_panic;
 use xilem::palette::css;
@@ -25,7 +24,7 @@ pub(crate) fn thread(
     // The hard part there would be locking the scroll properly (i.e. once the thread loads)
     thread: &Context,
     // TODO: Think about allowing composing a reply.
-) -> impl WidgetView<Edit<Placehero>, Navigation> + use<> {
+) -> impl WidgetView<Placehero, Navigation> + use<> {
     let mut ancestor_views = Vec::new();
     let mut previous_parent = None;
     for ancestor in &thread.ancestors {
@@ -72,7 +71,7 @@ pub(crate) fn thread(
 ///
 /// These are rendered without a containing box, and with an adjoining "reply indicator"
 /// (which is currently known to be terrible!).
-fn thread_ancestor(status: &Status) -> impl WidgetView<Edit<Placehero>, Navigation> + use<> {
+fn thread_ancestor(status: &Status) -> impl WidgetView<Placehero, Navigation> + use<> {
     sized_box(flex_row((
         // An awful left-side border.
         flex_col(())

placehero/src/components/timeline.rs

@@ -4,8 +4,8 @@
 use megalodon::Megalodon;
 use megalodon::entities::{Account, Status};
 use megalodon::megalodon::GetAccountStatusesInputOptions;
+use xilem::core::fork;
 use xilem::core::one_of::{OneOf, OneOf3};
-use xilem::core::{Edit, fork};
 use xilem::masonry::core::ArcStr;
 use xilem::masonry::layout::AsUnit;
 use xilem::palette::css;
@@ -59,10 +59,7 @@ impl Timeline {
         }
     }
 
-    pub(crate) fn view(
-        &mut self,
-        mastodon: Mastodon,
-    ) -> impl WidgetView<Edit<Self>, Navigation> + use<> {
+    pub(crate) fn view(&mut self, mastodon: Mastodon) -> impl WidgetView<Self, Navigation> + use<> {
         // We clone the relevant user id for use in `worker_raw`
         // (We plan for the function which makes the future to have access to the app state, but that hasn't happened yet)
         let user = self.user_id.clone();
@@ -183,9 +180,7 @@ impl Timeline {
 // I think you want the same thing, but without the box, and without any "this is a reply" indicator.
 // It also wouldn't need to handle reblogs (the API doesn't provide any way to make a reply status which is a reblog).
 // N.b. API wise, there's no reason that you can't reply to a "reblog" status. TODO: Confirm this
-pub(crate) fn timeline_status(
-    status: &Status,
-) -> impl WidgetView<Edit<Timeline>, Navigation> + use<> {
+pub(crate) fn timeline_status(status: &Status) -> impl WidgetView<Timeline, Navigation> + use<> {
     let (info_line, primary_status) = if let Some(reblog) = status.reblog.as_ref() {
         (
             Some(prose(format!("🔄 {} boosted", status.account.display_name))),

placehero/src/lib.rs

@@ -25,7 +25,7 @@ use megalodon::entities::{Context, Instance, Status};
 use megalodon::error::{Kind, OwnError};
 use megalodon::{Megalodon, mastodon};
 use xilem::core::one_of::{Either, OneOf, OneOf3, OneOf6};
-use xilem::core::{Edit, NoElement, View, fork, lens, map_action, map_state};
+use xilem::core::{NoElement, View, fork, lens, map_action, map_state};
 use xilem::masonry::layout::AsUnit;
 use xilem::style::Style;
 use xilem::tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
@@ -84,7 +84,7 @@ enum MainState {
     New(PlaceheroWithLogin),
 }
 
-fn select_app(state: &mut MainState) -> impl WidgetView<Edit<MainState>> + use<> {
+fn select_app(state: &mut MainState) -> impl WidgetView<MainState> + use<> {
     match state {
         MainState::Selecting => OneOf3::A(
             flex_col((
@@ -104,13 +104,13 @@ fn select_app(state: &mut MainState) -> impl WidgetView<Edit<MainState>> + use<>
             ))
             .main_axis_alignment(MainAxisAlignment::Center),
         ),
-        MainState::Old(_) => OneOf::B(lens(app_logic, |state: &mut MainState, ()| {
+        MainState::Old(_) => OneOf::B(lens(app_logic, |state: &mut MainState| {
             let MainState::Old(placehero) = state else {
                 unreachable!()
             };
             placehero
         })),
-        MainState::New(_) => OneOf::C(lens(login_flow::app_logic, |state: &mut MainState, ()| {
+        MainState::New(_) => OneOf::C(lens(login_flow::app_logic, |state: &mut MainState| {
             let MainState::New(placehero) = state else {
                 unreachable!()
             };
@@ -163,7 +163,7 @@ impl Default for Placehero {
 }
 
 impl Placehero {
-    fn sidebar(&mut self) -> impl WidgetView<Edit<Self>, Navigation> + use<> {
+    fn sidebar(&mut self) -> impl WidgetView<Self, Navigation> + use<> {
         if let Some(instance) = &self.instance {
             let back = if self.show_context.is_some() {
                 // TODO: Make the ⬅️ arrow not be available to screen readers.
@@ -200,7 +200,7 @@ impl Placehero {
         }
     }
 
-    fn main_view(&mut self) -> impl WidgetView<Edit<Self>, Navigation> + use<> {
+    fn main_view(&mut self) -> impl WidgetView<Self, Navigation> + use<> {
         if let Some(show_context) = self.show_context.as_ref() {
             if let Some(context) = self.context.as_ref() {
                 // TODO: Display the status until the entire thread loads; this is hard because
@@ -224,15 +224,15 @@ impl Placehero {
                 // In the current edition of the app, the timeline is never removed
                 // If it ever is, we'll need to be more careful here.
                 // The patterns are still in flux.
-                |this: &mut Self, ()| this.timeline.as_mut().unwrap(),
+                |this: &mut Self| this.timeline.as_mut().unwrap(),
             ))
         } else {
             OneOf::F(prose("No statuses yet loaded"))
         }
     }
 }
 
-fn app_logic(app_state: &mut Placehero) -> impl WidgetView<Edit<Placehero>> + use<> {
+fn app_logic(app_state: &mut Placehero) -> impl WidgetView<Placehero> + use<> {
     Avatars::provide(fork(
         map_action(
             split(app_state.sidebar(), app_state.main_view()).split_point(0.2),
@@ -276,7 +276,7 @@ fn app_logic(app_state: &mut Placehero) -> impl WidgetView<Edit<Placehero>> + us
 
 fn load_contexts(
     mastodon: Mastodon,
-) -> impl View<Edit<Placehero>, (), ViewCtx, Element = NoElement> + use<> {
+) -> impl View<Placehero, (), ViewCtx, Element = NoElement> + use<> {
     worker_raw(
         move |result, mut recv: UnboundedReceiver<String>| {
             let mastodon = mastodon.clone();
@@ -320,7 +320,7 @@ fn load_contexts(
 
 fn load_instance(
     mastodon: Mastodon,
-) -> impl View<Edit<Placehero>, (), ViewCtx, Element = NoElement> + use<> {
+) -> impl View<Placehero, (), ViewCtx, Element = NoElement> + use<> {
     task_raw(
         move |result, _| {
             let mastodon = mastodon.clone();
@@ -345,7 +345,7 @@ fn load_instance(
 
 fn load_account(
     mastodon: Mastodon,
-) -> impl View<Edit<Placehero>, (), ViewCtx, Element = NoElement> + use<> {
+) -> impl View<Placehero, (), ViewCtx, Element = NoElement> + use<> {
     worker_raw(
         move |result, mut recv: UnboundedReceiver<String>| {
             let mastodon = mastodon.clone();

placehero/src/login_flow.rs

@@ -5,7 +5,7 @@
 
 use xilem::{
     WidgetView,
-    core::{Edit, one_of::Either},
+    core::one_of::Either,
     view::{CrossAxisAlignment, FlexExt, flex_col, label, prose},
 };
 
@@ -27,7 +27,7 @@ impl PlaceheroWithLogin {
 
 pub(crate) fn app_logic(
     state: &mut PlaceheroWithLogin,
-) -> impl WidgetView<Edit<PlaceheroWithLogin>> + use<> {
+) -> impl WidgetView<PlaceheroWithLogin> + use<> {
     let Some(_login) = &mut state.login else {
         return Either::A(flex_col((
             prose("Error: Placehero not ran using cargo run.")

xilem/README.md

@@ -78,11 +78,10 @@ A simple incrementing counter application looks like:
 use winit::error::EventLoopError;
 use xilem::view::{text_button, flex_col, label};
 use xilem::{EventLoop, WindowOptions, WidgetView, Xilem};
-use xilem::core::Edit;
 
 struct Counter(i32);
 
-fn app_logic(data: &mut Counter) -> impl WidgetView<Edit<Counter>> + use<> {
+fn app_logic(data: &mut Counter) -> impl WidgetView<Counter> + use<> {
     flex_col((
         label(format!("{}", data.0)),
         text_button("increment", |data: &mut Counter| data.0 += 1),
@@ -143,7 +142,7 @@ This is new syntax in the 2024 edition, and so it might be unfamiliar.
 Here's a snippet from the Xilem examples:
 
 ```rust
-fn app_logic(data: &mut EmojiPagination) -> impl WidgetView<Edit<EmojiPagination>> + use<> {
+fn app_logic(data: &mut EmojiPagination) -> impl WidgetView<EmojiPagination> + use<> {
    // ...
 }
 ```

xilem/examples/calc.rs

@@ -13,7 +13,6 @@ use xilem::view::{
     FlexSequence, FlexSpacer, GridExt, GridSequence, button, flex_row, grid, label, text_button,
 };
 use xilem::{Color, EventLoop, EventLoopBuilder, WidgetView, WindowOptions, Xilem, palette};
-use xilem_core::{Edit, ViewArgument};
 
 #[derive(Copy, Clone)]
 enum MathOperator {
@@ -191,7 +190,7 @@ impl Calculator {
     }
 }
 
-fn num_row(nums: [&'static str; 3], row: i32) -> impl GridSequence<Edit<Calculator>> {
+fn num_row(nums: [&'static str; 3], row: i32) -> impl GridSequence<Calculator> {
     let mut views: Vec<_> = vec![];
     for (i, num) in nums.iter().enumerate() {
         views.push(digit_button(num).grid_pos(i32::try_from(i).unwrap(), row));
@@ -201,7 +200,7 @@ fn num_row(nums: [&'static str; 3], row: i32) -> impl GridSequence<Edit<Calculat
 
 const DISPLAY_FONT_SIZE: f32 = 30.;
 const GRID_GAP: Length = Length::const_px(2.);
-fn app_logic(data: &mut Calculator) -> impl WidgetView<Edit<Calculator>> + use<> {
+fn app_logic(data: &mut Calculator) -> impl WidgetView<Calculator> + use<> {
     grid(
         (
             // Display
@@ -253,7 +252,7 @@ fn app_logic(data: &mut Calculator) -> impl WidgetView<Edit<Calculator>> + use<>
 }
 
 /// Creates a horizontal centered flex row designed for the display portion of the calculator.
-fn centered_flex_row<State: ViewArgument, Seq: FlexSequence<State> + Send + Sync + 'static>(
+fn centered_flex_row<State: 'static, Seq: FlexSequence<State> + Send + Sync + 'static>(
     sequence: Seq,
 ) -> impl WidgetView<State, ()> {
     flex_row(sequence)
@@ -264,15 +263,15 @@ fn centered_flex_row<State: ViewArgument, Seq: FlexSequence<State> + Send + Sync
 
 /// Returns a label intended to be used in the calculator's top display.
 /// The default text size is out of proportion for this use case.
-fn display_label(text: &str) -> impl WidgetView<Edit<Calculator>> + use<> {
+fn display_label(text: &str) -> impl WidgetView<Calculator> + use<> {
     label(text).text_size(DISPLAY_FONT_SIZE)
 }
 
 /// Returns one button
 fn one_button(
-    content: impl WidgetView<Edit<Calculator>>,
+    content: impl WidgetView<Calculator>,
     callback: impl Fn(&mut Calculator) + Send + Sync + 'static,
-) -> impl WidgetView<Edit<Calculator>> {
+) -> impl WidgetView<Calculator> {
     const BLUE: Color = Color::from_rgb8(0x00, 0x8d, 0xdd);
     button(content, callback)
         .background_color(BLUE)
@@ -283,7 +282,7 @@ fn one_button(
 
 /// Returns a button that triggers the calculator's operator handler,
 /// `on_entered_operator()`.
-fn operator_button(math_operator: MathOperator) -> impl WidgetView<Edit<Calculator>> {
+fn operator_button(math_operator: MathOperator) -> impl WidgetView<Calculator> {
     one_button(
         label(math_operator.as_str()),
         move |data: &mut Calculator| {
@@ -293,7 +292,7 @@ fn operator_button(math_operator: MathOperator) -> impl WidgetView<Edit<Calculat
 }
 
 /// A button which adds `digit` to the current input when pressed
-fn digit_button(digit: &'static str) -> impl WidgetView<Edit<Calculator>> {
+fn digit_button(digit: &'static str) -> impl WidgetView<Calculator> {
     const GRAY: Color = Color::from_rgb8(0x3a, 0x3a, 0x3a);
 
     text_button(digit, |data: &mut Calculator| {