From 8ee84249ecfa97316e7cdb69a4aae5453da5b4da Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 28 Nov 2023 15:43:43 -0500 Subject: [PATCH] storybook2: Unsuppress and fix warnings (#3425) This PR unsupresses the warnings in `storybook2` and summarily fixes them. Release Notes: - N/A --- crates/storybook2/src/stories/focus.rs | 9 ++++----- crates/storybook2/src/stories/kitchen_sink.rs | 2 +- crates/storybook2/src/stories/picker.rs | 4 ++-- crates/storybook2/src/stories/scroll.rs | 2 +- crates/storybook2/src/stories/text.rs | 4 ++-- crates/storybook2/src/stories/z_index.rs | 4 ++-- crates/storybook2/src/storybook2.rs | 6 ++---- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/crates/storybook2/src/stories/focus.rs b/crates/storybook2/src/stories/focus.rs index 6f757240ebe21df85f12e0958946f34ab06797e0..77aa057b09407a10e6bf658f7c73c1a4a1c7470a 100644 --- a/crates/storybook2/src/stories/focus.rs +++ b/crates/storybook2/src/stories/focus.rs @@ -33,7 +33,6 @@ impl Render for FocusStory { let theme = cx.theme(); let color_1 = theme.status().created; let color_2 = theme.status().modified; - let color_3 = theme.status().deleted; let color_4 = theme.status().conflict; let color_5 = theme.status().ignored; let color_6 = theme.status().renamed; @@ -42,10 +41,10 @@ impl Render for FocusStory { .id("parent") .focusable() .key_context("parent") - .on_action(cx.listener(|_, action: &ActionA, cx| { + .on_action(cx.listener(|_, _action: &ActionA, _cx| { println!("Action A dispatched on parent"); })) - .on_action(cx.listener(|_, action: &ActionB, cx| { + .on_action(cx.listener(|_, _action: &ActionB, _cx| { println!("Action B dispatched on parent"); })) .on_focus(cx.listener(|_, _, _| println!("Parent focused"))) @@ -61,7 +60,7 @@ impl Render for FocusStory { div() .track_focus(&self.child_1_focus) .key_context("child-1") - .on_action(cx.listener(|_, action: &ActionB, cx| { + .on_action(cx.listener(|_, _action: &ActionB, _cx| { println!("Action B dispatched on child 1 during"); })) .w_full() @@ -83,7 +82,7 @@ impl Render for FocusStory { div() .track_focus(&self.child_2_focus) .key_context("child-2") - .on_action(cx.listener(|_, action: &ActionC, cx| { + .on_action(cx.listener(|_, _action: &ActionC, _cx| { println!("Action C dispatched on child 2"); })) .w_full() diff --git a/crates/storybook2/src/stories/kitchen_sink.rs b/crates/storybook2/src/stories/kitchen_sink.rs index f79a27aa89f875ae10cfdd12fd15b13192459a54..271285cc2f56263593f2ed0a7691bd5ca649b5e3 100644 --- a/crates/storybook2/src/stories/kitchen_sink.rs +++ b/crates/storybook2/src/stories/kitchen_sink.rs @@ -9,7 +9,7 @@ pub struct KitchenSinkStory; impl KitchenSinkStory { pub fn view(cx: &mut WindowContext) -> View { - cx.build_view(|cx| Self) + cx.build_view(|_cx| Self) } } diff --git a/crates/storybook2/src/stories/picker.rs b/crates/storybook2/src/stories/picker.rs index 80818946f6dc5234f177366a435d3e50dd4223b3..75eb0d88e792a383d058823a3f3a22473fd9844d 100644 --- a/crates/storybook2/src/stories/picker.rs +++ b/crates/storybook2/src/stories/picker.rs @@ -51,7 +51,7 @@ impl PickerDelegate for Delegate { &self, ix: usize, selected: bool, - cx: &mut gpui::ViewContext>, + _cx: &mut gpui::ViewContext>, ) -> Option { let Some(candidate_ix) = self.matches.get(ix) else { return None; @@ -76,7 +76,7 @@ impl PickerDelegate for Delegate { cx.notify(); } - fn confirm(&mut self, secondary: bool, cx: &mut gpui::ViewContext>) { + fn confirm(&mut self, secondary: bool, _cx: &mut gpui::ViewContext>) { let candidate_ix = self.matches[self.selected_ix]; let candidate = self.candidates[candidate_ix].string.clone(); diff --git a/crates/storybook2/src/stories/scroll.rs b/crates/storybook2/src/stories/scroll.rs index 9b9a54e1e6736e05183654c51f4fff7ccc69b968..297e65d411ddfecd2cfa1d92d853ad0082e53e00 100644 --- a/crates/storybook2/src/stories/scroll.rs +++ b/crates/storybook2/src/stories/scroll.rs @@ -6,7 +6,7 @@ pub struct ScrollStory; impl ScrollStory { pub fn view(cx: &mut WindowContext) -> View { - cx.build_view(|cx| ScrollStory) + cx.build_view(|_cx| ScrollStory) } } diff --git a/crates/storybook2/src/stories/text.rs b/crates/storybook2/src/stories/text.rs index 42009136c414750de416dd3272e82955cb17ef60..3cb39aa01a2122691ed4a337d37e4d6a26c1eb07 100644 --- a/crates/storybook2/src/stories/text.rs +++ b/crates/storybook2/src/stories/text.rs @@ -8,7 +8,7 @@ pub struct TextStory; impl TextStory { pub fn view(cx: &mut WindowContext) -> View { - cx.build_view(|cx| Self) + cx.build_view(|_cx| Self) } } @@ -68,7 +68,7 @@ impl Render for TextStory { cx.text_style().to_run(18), ]), ) - .on_click(vec![2..4, 1..3, 7..9], |range_ix, cx| { + .on_click(vec![2..4, 1..3, 7..9], |range_ix, _cx| { println!("Clicked range {range_ix}"); }) ) diff --git a/crates/storybook2/src/stories/z_index.rs b/crates/storybook2/src/stories/z_index.rs index 9d04d3d81ff3a167b015efb494e78cb0754d7202..c6a4b68cc369f4e0bf409f714e585c2bde6f47f4 100644 --- a/crates/storybook2/src/stories/z_index.rs +++ b/crates/storybook2/src/stories/z_index.rs @@ -9,7 +9,7 @@ pub struct ZIndexStory; impl Render for ZIndexStory { type Element = Div; - fn render(&mut self, cx: &mut ViewContext) -> Self::Element { + fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { Story::container().child(Story::title("z-index")).child( div() .flex() @@ -84,7 +84,7 @@ struct ZIndexExample { impl RenderOnce for ZIndexExample { type Rendered = Div; - fn render(self, cx: &mut WindowContext) -> Self::Rendered { + fn render(self, _cx: &mut WindowContext) -> Self::Rendered { div() .relative() .size_full() diff --git a/crates/storybook2/src/storybook2.rs b/crates/storybook2/src/storybook2.rs index 2a62c135b186c85910f497b33b82bbcd46739768..e1bb4ef3f46255381f919f789c9ec832911b30af 100644 --- a/crates/storybook2/src/storybook2.rs +++ b/crates/storybook2/src/storybook2.rs @@ -1,5 +1,3 @@ -#![allow(dead_code, unused_variables)] - mod assets; mod stories; mod story_selector; @@ -70,7 +68,7 @@ fn main() { language::init(cx); editor::init(cx); - let window = cx.open_window( + let _window = cx.open_window( WindowOptions { bounds: WindowBounds::Fixed(Bounds { origin: Default::default(), @@ -104,7 +102,7 @@ impl StoryWrapper { impl Render for StoryWrapper { type Element = Div; - fn render(&mut self, cx: &mut ViewContext) -> Self::Element { + fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { div() .flex() .flex_col()