Reconcile with upstream changes
This commit is contained in:
parent
9581279919
commit
8cd112110e
44 changed files with 112 additions and 107 deletions
|
@ -27,7 +27,7 @@ impl<S: 'static + Send + Sync> Toolbar<S> {
|
|||
}
|
||||
}
|
||||
|
||||
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
|
||||
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
|
||||
let theme = theme(cx);
|
||||
|
||||
div()
|
||||
|
@ -74,7 +74,7 @@ mod stories {
|
|||
}
|
||||
}
|
||||
|
||||
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
|
||||
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
|
||||
let theme = theme(cx);
|
||||
|
||||
struct LeftItemsPayload {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue