diff --git a/README.md b/README.md index 81f5d0a710..1aaa1e5b30 100644 --- a/README.md +++ b/README.md @@ -202,7 +202,7 @@ To use the lens, wrap your widget with `LensWrap` (note the conversion of CamelCase to snake_case): ```rust -LensWrap::new(WidgetThatExpectsf64::new(), lenses::app_state::value); +LensWrap::new(WidgetThatExpectsf64::new(), app_state::value); ``` ## Using druid diff --git a/druid-derive/src/lens.rs b/druid-derive/src/lens.rs index 300dc66f2c..bd0feaf46d 100644 --- a/druid-derive/src/lens.rs +++ b/druid-derive/src/lens.rs @@ -87,15 +87,12 @@ fn derive_struct(input: &syn::DeriveInput) -> Result impl Widget { let mut column = Flex::column(); let display = LensWrap::new( DynLabel::new(|data: &String, _env| data.clone()), - lenses::calc_state::value, + calc_state::value, ); column.add_child(pad(display), 0.0); column.add_child( diff --git a/druid/examples/either.rs b/druid/examples/either.rs index f8afc74f2f..b8321cb506 100644 --- a/druid/examples/either.rs +++ b/druid/examples/either.rs @@ -35,15 +35,12 @@ fn ui_builder() -> impl Widget { let mut col = Flex::column(); col.add_child( - Padding::new( - 5.0, - LensWrap::new(Checkbox::new(), lenses::app_state::which), - ), + Padding::new(5.0, LensWrap::new(Checkbox::new(), app_state::which)), 0.0, ); let either = Either::new( |data, _env| data.which, - Padding::new(5.0, LensWrap::new(Slider::new(), lenses::app_state::value)), + Padding::new(5.0, LensWrap::new(Slider::new(), app_state::value)), Padding::new(5.0, label), ); col.add_child(either, 0.0); diff --git a/druid/examples/slider.rs b/druid/examples/slider.rs index 1e4d128e2e..fd2a756d1f 100644 --- a/druid/examples/slider.rs +++ b/druid/examples/slider.rs @@ -31,13 +31,13 @@ fn build_widget() -> impl Widget { } }); let mut row = Flex::row(); - let checkbox = LensWrap::new(Checkbox::new(), lenses::demo_state::double); + let checkbox = LensWrap::new(Checkbox::new(), demo_state::double); let checkbox_label = Label::new("double the value"); row.add_child(checkbox, 0.0); row.add_child(Padding::new(5.0, checkbox_label), 1.0); - let bar = LensWrap::new(ProgressBar::new(), lenses::demo_state::value); - let slider = LensWrap::new(Slider::new(), lenses::demo_state::value); + let bar = LensWrap::new(ProgressBar::new(), demo_state::value); + let slider = LensWrap::new(Slider::new(), demo_state::value); let button_1 = Button::sized( "increment ", diff --git a/druid/examples/switch.rs b/druid/examples/switch.rs index ef7a30547b..b4ee759156 100644 --- a/druid/examples/switch.rs +++ b/druid/examples/switch.rs @@ -23,7 +23,7 @@ struct DemoState { fn build_widget() -> impl Widget { let mut col = Flex::column(); let mut row = Flex::row(); - let switch = LensWrap::new(Switch::new(), lenses::demo_state::value); + let switch = LensWrap::new(Switch::new(), demo_state::value); let switch_label = Label::new("Setting label"); row.add_child(Padding::new(5.0, switch_label), 0.0);