Fix clippy lints for all crates and features
... and check those in CI as well!
This commit is contained in:
parent
d53cc5498b
commit
2065a40f64
55 changed files with 237 additions and 232 deletions
2
.github/workflows/lint.yml
vendored
2
.github/workflows/lint.yml
vendored
|
|
@ -9,4 +9,4 @@ jobs:
|
||||||
components: clippy
|
components: clippy
|
||||||
- uses: actions/checkout@master
|
- uses: actions/checkout@master
|
||||||
- name: Check lints
|
- name: Check lints
|
||||||
run: cargo clippy --all --no-deps
|
run: cargo clippy --all --all-features --no-deps
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ impl Sandbox for ColorPalette {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Theme {
|
struct Theme {
|
||||||
lower: Vec<Color>,
|
lower: Vec<Color>,
|
||||||
base: Color,
|
base: Color,
|
||||||
higher: Vec<Color>,
|
higher: Vec<Color>,
|
||||||
|
|
|
||||||
|
|
@ -150,8 +150,7 @@ mod numeric_input {
|
||||||
self.value
|
self.value
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(u32::to_string)
|
.map(u32::to_string)
|
||||||
.as_ref()
|
.as_deref()
|
||||||
.map(String::as_str)
|
|
||||||
.unwrap_or(""),
|
.unwrap_or(""),
|
||||||
Event::InputChanged,
|
Event::InputChanged,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -64,12 +64,12 @@ mod circle {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Circle
|
impl<'a, Message, Renderer> From<Circle> for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: renderer::Renderer,
|
Renderer: renderer::Renderer,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(circle: Circle) -> Self {
|
||||||
Element::new(self)
|
Self::new(circle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ impl Application for Example {
|
||||||
fn update(&mut self, message: Message) -> Command<Message> {
|
fn update(&mut self, message: Message) -> Command<Message> {
|
||||||
match message {
|
match message {
|
||||||
Message::Add => {
|
Message::Add => {
|
||||||
self.last_id = self.last_id + 1;
|
self.last_id += 1;
|
||||||
|
|
||||||
self.downloads.push(Download::new(self.last_id));
|
self.downloads.push(Download::new(self.last_id));
|
||||||
}
|
}
|
||||||
|
|
@ -134,8 +134,8 @@ impl Download {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn progress(&mut self, new_progress: download::Progress) {
|
pub fn progress(&mut self, new_progress: download::Progress) {
|
||||||
match &mut self.state {
|
if let State::Downloading { progress } = &mut self.state {
|
||||||
State::Downloading { progress } => match new_progress {
|
match new_progress {
|
||||||
download::Progress::Started => {
|
download::Progress::Started => {
|
||||||
*progress = 0.0;
|
*progress = 0.0;
|
||||||
}
|
}
|
||||||
|
|
@ -152,8 +152,7 @@ impl Download {
|
||||||
button: button::State::new(),
|
button: button::State::new(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -280,7 +280,7 @@ mod grid {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn view<'a>(&'a mut self) -> Element<'a, Message> {
|
pub fn view(&mut self) -> Element<Message> {
|
||||||
Canvas::new(self)
|
Canvas::new(self)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
|
|
@ -328,7 +328,7 @@ mod grid {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> canvas::Program<Message> for Grid {
|
impl canvas::Program<Message> for Grid {
|
||||||
fn update(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
|
|
@ -826,13 +826,13 @@ struct Controls {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Controls {
|
impl Controls {
|
||||||
fn view<'a>(
|
fn view(
|
||||||
&'a mut self,
|
&mut self,
|
||||||
is_playing: bool,
|
is_playing: bool,
|
||||||
is_grid_enabled: bool,
|
is_grid_enabled: bool,
|
||||||
speed: usize,
|
speed: usize,
|
||||||
preset: Preset,
|
preset: Preset,
|
||||||
) -> Element<'a, Message> {
|
) -> Element<Message> {
|
||||||
let playback_controls = Row::new()
|
let playback_controls = Row::new()
|
||||||
.spacing(10)
|
.spacing(10)
|
||||||
.push(
|
.push(
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum Preset {
|
pub enum Preset {
|
||||||
Custom,
|
Custom,
|
||||||
XKCD,
|
Xkcd,
|
||||||
Glider,
|
Glider,
|
||||||
SmallExploder,
|
SmallExploder,
|
||||||
Exploder,
|
Exploder,
|
||||||
|
|
@ -14,7 +14,7 @@ pub enum Preset {
|
||||||
|
|
||||||
pub static ALL: &[Preset] = &[
|
pub static ALL: &[Preset] = &[
|
||||||
Preset::Custom,
|
Preset::Custom,
|
||||||
Preset::XKCD,
|
Preset::Xkcd,
|
||||||
Preset::Glider,
|
Preset::Glider,
|
||||||
Preset::SmallExploder,
|
Preset::SmallExploder,
|
||||||
Preset::Exploder,
|
Preset::Exploder,
|
||||||
|
|
@ -30,7 +30,7 @@ impl Preset {
|
||||||
#[rustfmt::skip]
|
#[rustfmt::skip]
|
||||||
let cells = match self {
|
let cells = match self {
|
||||||
Preset::Custom => vec![],
|
Preset::Custom => vec![],
|
||||||
Preset::XKCD => vec![
|
Preset::Xkcd => vec![
|
||||||
" xxx ",
|
" xxx ",
|
||||||
" x x ",
|
" x x ",
|
||||||
" x x ",
|
" x x ",
|
||||||
|
|
@ -116,7 +116,7 @@ impl Preset {
|
||||||
|
|
||||||
impl Default for Preset {
|
impl Default for Preset {
|
||||||
fn default() -> Preset {
|
fn default() -> Preset {
|
||||||
Preset::XKCD
|
Preset::Xkcd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -127,7 +127,7 @@ impl std::fmt::Display for Preset {
|
||||||
"{}",
|
"{}",
|
||||||
match self {
|
match self {
|
||||||
Preset::Custom => "Custom",
|
Preset::Custom => "Custom",
|
||||||
Preset::XKCD => "xkcd #2293",
|
Preset::Xkcd => "xkcd #2293",
|
||||||
Preset::Glider => "Glider",
|
Preset::Glider => "Glider",
|
||||||
Preset::SmallExploder => "Small Exploder",
|
Preset::SmallExploder => "Small Exploder",
|
||||||
Preset::Exploder => "Exploder",
|
Preset::Exploder => "Exploder",
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ mod rainbow {
|
||||||
layout, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
|
layout, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
pub struct Rainbow;
|
pub struct Rainbow;
|
||||||
|
|
||||||
impl Rainbow {
|
impl Rainbow {
|
||||||
|
|
@ -148,12 +149,12 @@ mod rainbow {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>> for Rainbow
|
impl<'a, Message, B, T> From<Rainbow> for Element<'a, Message, Renderer<B, T>>
|
||||||
where
|
where
|
||||||
B: Backend,
|
B: Backend,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
|
fn from(rainbow: Rainbow) -> Self {
|
||||||
Element::new(self)
|
Self::new(rainbow)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ pub fn main() {
|
||||||
|
|
||||||
let mut cursor_position = PhysicalPosition::new(-1.0, -1.0);
|
let mut cursor_position = PhysicalPosition::new(-1.0, -1.0);
|
||||||
let mut modifiers = ModifiersState::default();
|
let mut modifiers = ModifiersState::default();
|
||||||
let mut clipboard = Clipboard::connect(&windowed_context.window());
|
let mut clipboard = Clipboard::connect(windowed_context.window());
|
||||||
|
|
||||||
let mut renderer = Renderer::new(Backend::new(&gl, Settings::default()));
|
let mut renderer = Renderer::new(Backend::new(&gl, Settings::default()));
|
||||||
|
|
||||||
|
|
@ -73,13 +73,12 @@ pub fn main() {
|
||||||
);
|
);
|
||||||
let mut resized = false;
|
let mut resized = false;
|
||||||
|
|
||||||
let scene = Scene::new(&gl, &shader_version);
|
let scene = Scene::new(&gl, shader_version);
|
||||||
|
|
||||||
event_loop.run(move |event, _, control_flow| {
|
event_loop.run(move |event, _, control_flow| {
|
||||||
*control_flow = ControlFlow::Wait;
|
*control_flow = ControlFlow::Wait;
|
||||||
|
|
||||||
match event {
|
match event {
|
||||||
Event::LoopDestroyed => return,
|
|
||||||
Event::WindowEvent { event, .. } => {
|
Event::WindowEvent { event, .. } => {
|
||||||
match event {
|
match event {
|
||||||
WindowEvent::CursorMoved { position, .. } => {
|
WindowEvent::CursorMoved { position, .. } => {
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ impl Program for Controls {
|
||||||
t,
|
t,
|
||||||
"Placeholder",
|
"Placeholder",
|
||||||
text,
|
text,
|
||||||
move |text| Message::TextChanged(text),
|
Message::TextChanged,
|
||||||
)),
|
)),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ pub fn main() {
|
||||||
let instance = wgpu::Instance::new(backend);
|
let instance = wgpu::Instance::new(backend);
|
||||||
let surface = unsafe { instance.create_surface(&window) };
|
let surface = unsafe { instance.create_surface(&window) };
|
||||||
|
|
||||||
let (format, (mut device, queue)) = futures::executor::block_on(async {
|
let (format, (device, queue)) = futures::executor::block_on(async {
|
||||||
let adapter = wgpu::util::initialize_adapter_from_env_or_default(
|
let adapter = wgpu::util::initialize_adapter_from_env_or_default(
|
||||||
&instance,
|
&instance,
|
||||||
backend,
|
backend,
|
||||||
|
|
@ -128,13 +128,13 @@ pub fn main() {
|
||||||
let mut staging_belt = wgpu::util::StagingBelt::new(5 * 1024);
|
let mut staging_belt = wgpu::util::StagingBelt::new(5 * 1024);
|
||||||
|
|
||||||
// Initialize scene and GUI controls
|
// Initialize scene and GUI controls
|
||||||
let scene = Scene::new(&mut device, format);
|
let scene = Scene::new(&device, format);
|
||||||
let controls = Controls::new();
|
let controls = Controls::new();
|
||||||
|
|
||||||
// Initialize iced
|
// Initialize iced
|
||||||
let mut debug = Debug::new();
|
let mut debug = Debug::new();
|
||||||
let mut renderer =
|
let mut renderer =
|
||||||
Renderer::new(Backend::new(&mut device, Settings::default(), format));
|
Renderer::new(Backend::new(&device, Settings::default(), format));
|
||||||
|
|
||||||
let mut state = program::State::new(
|
let mut state = program::State::new(
|
||||||
controls,
|
controls,
|
||||||
|
|
@ -208,8 +208,8 @@ pub fn main() {
|
||||||
surface.configure(
|
surface.configure(
|
||||||
&device,
|
&device,
|
||||||
&wgpu::SurfaceConfiguration {
|
&wgpu::SurfaceConfiguration {
|
||||||
|
format,
|
||||||
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
||||||
format: format,
|
|
||||||
width: size.width,
|
width: size.width,
|
||||||
height: size.height,
|
height: size.height,
|
||||||
present_mode: wgpu::PresentMode::AutoVsync,
|
present_mode: wgpu::PresentMode::AutoVsync,
|
||||||
|
|
@ -244,7 +244,7 @@ pub fn main() {
|
||||||
// And then iced on top
|
// And then iced on top
|
||||||
renderer.with_primitives(|backend, primitive| {
|
renderer.with_primitives(|backend, primitive| {
|
||||||
backend.present(
|
backend.present(
|
||||||
&mut device,
|
&device,
|
||||||
&mut staging_belt,
|
&mut staging_belt,
|
||||||
&mut encoder,
|
&mut encoder,
|
||||||
&view,
|
&view,
|
||||||
|
|
|
||||||
|
|
@ -66,40 +66,37 @@ fn build_pipeline(
|
||||||
bind_group_layouts: &[],
|
bind_group_layouts: &[],
|
||||||
});
|
});
|
||||||
|
|
||||||
let pipeline =
|
device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
||||||
device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
label: None,
|
||||||
label: None,
|
layout: Some(&pipeline_layout),
|
||||||
layout: Some(&pipeline_layout),
|
vertex: wgpu::VertexState {
|
||||||
vertex: wgpu::VertexState {
|
module: &vs_module,
|
||||||
module: &vs_module,
|
entry_point: "main",
|
||||||
entry_point: "main",
|
buffers: &[],
|
||||||
buffers: &[],
|
},
|
||||||
},
|
fragment: Some(wgpu::FragmentState {
|
||||||
fragment: Some(wgpu::FragmentState {
|
module: &fs_module,
|
||||||
module: &fs_module,
|
entry_point: "main",
|
||||||
entry_point: "main",
|
targets: &[Some(wgpu::ColorTargetState {
|
||||||
targets: &[Some(wgpu::ColorTargetState {
|
format: texture_format,
|
||||||
format: texture_format,
|
blend: Some(wgpu::BlendState {
|
||||||
blend: Some(wgpu::BlendState {
|
color: wgpu::BlendComponent::REPLACE,
|
||||||
color: wgpu::BlendComponent::REPLACE,
|
alpha: wgpu::BlendComponent::REPLACE,
|
||||||
alpha: wgpu::BlendComponent::REPLACE,
|
}),
|
||||||
}),
|
write_mask: wgpu::ColorWrites::ALL,
|
||||||
write_mask: wgpu::ColorWrites::ALL,
|
})],
|
||||||
})],
|
}),
|
||||||
}),
|
primitive: wgpu::PrimitiveState {
|
||||||
primitive: wgpu::PrimitiveState {
|
topology: wgpu::PrimitiveTopology::TriangleList,
|
||||||
topology: wgpu::PrimitiveTopology::TriangleList,
|
front_face: wgpu::FrontFace::Ccw,
|
||||||
front_face: wgpu::FrontFace::Ccw,
|
..Default::default()
|
||||||
..Default::default()
|
},
|
||||||
},
|
depth_stencil: None,
|
||||||
depth_stencil: None,
|
multisample: wgpu::MultisampleState {
|
||||||
multisample: wgpu::MultisampleState {
|
count: 1,
|
||||||
count: 1,
|
mask: !0,
|
||||||
mask: !0,
|
alpha_to_coverage_enabled: false,
|
||||||
alpha_to_coverage_enabled: false,
|
},
|
||||||
},
|
multiview: None,
|
||||||
multiview: None,
|
})
|
||||||
});
|
|
||||||
|
|
||||||
pipeline
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -192,8 +192,7 @@ impl Pokemon {
|
||||||
let description = entry
|
let description = entry
|
||||||
.flavor_text_entries
|
.flavor_text_entries
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|text| text.language.name == "en")
|
.find(|text| text.language.name == "en")
|
||||||
.next()
|
|
||||||
.ok_or(Error::LanguageError)?;
|
.ok_or(Error::LanguageError)?;
|
||||||
|
|
||||||
Ok(Pokemon {
|
Ok(Pokemon {
|
||||||
|
|
|
||||||
|
|
@ -143,8 +143,7 @@ mod numeric_input {
|
||||||
self.value
|
self.value
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(u32::to_string)
|
.map(u32::to_string)
|
||||||
.as_ref()
|
.as_deref()
|
||||||
.map(String::as_str)
|
|
||||||
.unwrap_or(""),
|
.unwrap_or(""),
|
||||||
Event::InputChanged,
|
Event::InputChanged,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -350,7 +350,7 @@ mod grid {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn view<'a>(&'a self) -> Element<'a, Message> {
|
pub fn view(&self) -> Element<Message> {
|
||||||
Canvas::new(self)
|
Canvas::new(self)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum Preset {
|
pub enum Preset {
|
||||||
Custom,
|
Custom,
|
||||||
XKCD,
|
Xkcd,
|
||||||
Glider,
|
Glider,
|
||||||
SmallExploder,
|
SmallExploder,
|
||||||
Exploder,
|
Exploder,
|
||||||
|
|
@ -14,7 +14,7 @@ pub enum Preset {
|
||||||
|
|
||||||
pub static ALL: &[Preset] = &[
|
pub static ALL: &[Preset] = &[
|
||||||
Preset::Custom,
|
Preset::Custom,
|
||||||
Preset::XKCD,
|
Preset::Xkcd,
|
||||||
Preset::Glider,
|
Preset::Glider,
|
||||||
Preset::SmallExploder,
|
Preset::SmallExploder,
|
||||||
Preset::Exploder,
|
Preset::Exploder,
|
||||||
|
|
@ -30,7 +30,7 @@ impl Preset {
|
||||||
#[rustfmt::skip]
|
#[rustfmt::skip]
|
||||||
let cells = match self {
|
let cells = match self {
|
||||||
Preset::Custom => vec![],
|
Preset::Custom => vec![],
|
||||||
Preset::XKCD => vec![
|
Preset::Xkcd => vec![
|
||||||
" xxx ",
|
" xxx ",
|
||||||
" x x ",
|
" x x ",
|
||||||
" x x ",
|
" x x ",
|
||||||
|
|
@ -116,7 +116,7 @@ impl Preset {
|
||||||
|
|
||||||
impl Default for Preset {
|
impl Default for Preset {
|
||||||
fn default() -> Preset {
|
fn default() -> Preset {
|
||||||
Preset::XKCD
|
Preset::Xkcd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -127,7 +127,7 @@ impl std::fmt::Display for Preset {
|
||||||
"{}",
|
"{}",
|
||||||
match self {
|
match self {
|
||||||
Preset::Custom => "Custom",
|
Preset::Custom => "Custom",
|
||||||
Preset::XKCD => "xkcd #2293",
|
Preset::Xkcd => "xkcd #2293",
|
||||||
Preset::Glider => "Glider",
|
Preset::Glider => "Glider",
|
||||||
Preset::SmallExploder => "Small Exploder",
|
Preset::SmallExploder => "Small Exploder",
|
||||||
Preset::Exploder => "Exploder",
|
Preset::Exploder => "Exploder",
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,7 @@ impl Application for Todos {
|
||||||
.size(30)
|
.size(30)
|
||||||
.on_submit(Message::CreateTask);
|
.on_submit(Message::CreateTask);
|
||||||
|
|
||||||
let controls = view_controls(&tasks, *filter);
|
let controls = view_controls(tasks, *filter);
|
||||||
let filtered_tasks =
|
let filtered_tasks =
|
||||||
tasks.iter().filter(|task| filter.matches(task));
|
tasks.iter().filter(|task| filter.matches(task));
|
||||||
|
|
||||||
|
|
@ -446,15 +446,15 @@ struct SavedState {
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum LoadError {
|
enum LoadError {
|
||||||
FileError,
|
File,
|
||||||
FormatError,
|
Format,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum SaveError {
|
enum SaveError {
|
||||||
FileError,
|
File,
|
||||||
WriteError,
|
Write,
|
||||||
FormatError,
|
Format,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
|
@ -465,7 +465,7 @@ impl SavedState {
|
||||||
{
|
{
|
||||||
project_dirs.data_dir().into()
|
project_dirs.data_dir().into()
|
||||||
} else {
|
} else {
|
||||||
std::env::current_dir().unwrap_or(std::path::PathBuf::new())
|
std::env::current_dir().unwrap_or_default()
|
||||||
};
|
};
|
||||||
|
|
||||||
path.push("todos.json");
|
path.push("todos.json");
|
||||||
|
|
@ -480,37 +480,37 @@ impl SavedState {
|
||||||
|
|
||||||
let mut file = async_std::fs::File::open(Self::path())
|
let mut file = async_std::fs::File::open(Self::path())
|
||||||
.await
|
.await
|
||||||
.map_err(|_| LoadError::FileError)?;
|
.map_err(|_| LoadError::File)?;
|
||||||
|
|
||||||
file.read_to_string(&mut contents)
|
file.read_to_string(&mut contents)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| LoadError::FileError)?;
|
.map_err(|_| LoadError::File)?;
|
||||||
|
|
||||||
serde_json::from_str(&contents).map_err(|_| LoadError::FormatError)
|
serde_json::from_str(&contents).map_err(|_| LoadError::Format)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn save(self) -> Result<(), SaveError> {
|
async fn save(self) -> Result<(), SaveError> {
|
||||||
use async_std::prelude::*;
|
use async_std::prelude::*;
|
||||||
|
|
||||||
let json = serde_json::to_string_pretty(&self)
|
let json = serde_json::to_string_pretty(&self)
|
||||||
.map_err(|_| SaveError::FormatError)?;
|
.map_err(|_| SaveError::Format)?;
|
||||||
|
|
||||||
let path = Self::path();
|
let path = Self::path();
|
||||||
|
|
||||||
if let Some(dir) = path.parent() {
|
if let Some(dir) = path.parent() {
|
||||||
async_std::fs::create_dir_all(dir)
|
async_std::fs::create_dir_all(dir)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::FileError)?;
|
.map_err(|_| SaveError::File)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
let mut file = async_std::fs::File::create(path)
|
let mut file = async_std::fs::File::create(path)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::FileError)?;
|
.map_err(|_| SaveError::File)?;
|
||||||
|
|
||||||
file.write_all(json.as_bytes())
|
file.write_all(json.as_bytes())
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::WriteError)?;
|
.map_err(|_| SaveError::Write)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is a simple way to save at most once every couple seconds
|
// This is a simple way to save at most once every couple seconds
|
||||||
|
|
|
||||||
|
|
@ -78,14 +78,6 @@ impl Sandbox for Tour {
|
||||||
.push(controls)
|
.push(controls)
|
||||||
.into();
|
.into();
|
||||||
|
|
||||||
let content = if self.debug {
|
|
||||||
// TODO
|
|
||||||
//content.explain(Color::BLACK)
|
|
||||||
content
|
|
||||||
} else {
|
|
||||||
content
|
|
||||||
};
|
|
||||||
|
|
||||||
let scrollable =
|
let scrollable =
|
||||||
scrollable(container(content).width(Length::Fill).center_x());
|
scrollable(container(content).width(Length::Fill).center_x());
|
||||||
|
|
||||||
|
|
@ -494,7 +486,7 @@ impl<'a> Step {
|
||||||
.push(ferris(width))
|
.push(ferris(width))
|
||||||
.push(slider(100..=500, width, StepMessage::ImageWidthChanged))
|
.push(slider(100..=500, width, StepMessage::ImageWidthChanged))
|
||||||
.push(
|
.push(
|
||||||
text(format!("Width: {} px", width.to_string()))
|
text(format!("Width: {} px", width))
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.horizontal_alignment(alignment::Horizontal::Center),
|
.horizontal_alignment(alignment::Horizontal::Center),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -65,8 +65,7 @@ impl Application for SolarSystem {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn subscription(&self) -> Subscription<Message> {
|
fn subscription(&self) -> Subscription<Message> {
|
||||||
time::every(std::time::Duration::from_millis(10))
|
time::every(std::time::Duration::from_millis(10)).map(Message::Tick)
|
||||||
.map(|instant| Message::Tick(instant))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn view(&mut self) -> Element<Message> {
|
fn view(&mut self) -> Element<Message> {
|
||||||
|
|
|
||||||
|
|
@ -67,13 +67,12 @@ impl Application for Stopwatch {
|
||||||
self.state = State::Idle;
|
self.state = State::Idle;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Message::Tick(now) => match &mut self.state {
|
Message::Tick(now) => {
|
||||||
State::Ticking { last_tick } => {
|
if let State::Ticking { last_tick } = &mut self.state {
|
||||||
self.duration += now - *last_tick;
|
self.duration += now - *last_tick;
|
||||||
*last_tick = now;
|
*last_tick = now;
|
||||||
}
|
}
|
||||||
_ => {}
|
}
|
||||||
},
|
|
||||||
Message::Reset => {
|
Message::Reset => {
|
||||||
self.duration = Duration::default();
|
self.duration = Duration::default();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -107,11 +107,8 @@ impl Application for Example {
|
||||||
ByteSize::kb(information.memory_total).to_string();
|
ByteSize::kb(information.memory_total).to_string();
|
||||||
|
|
||||||
let memory_total = Text::new(format!(
|
let memory_total = Text::new(format!(
|
||||||
"Memory (total): {}",
|
"Memory (total): {} kb ({})",
|
||||||
format!(
|
information.memory_total, memory_readable
|
||||||
"{} kb ({})",
|
|
||||||
information.memory_total, memory_readable
|
|
||||||
)
|
|
||||||
));
|
));
|
||||||
|
|
||||||
let memory_text = if let Some(memory_used) =
|
let memory_text = if let Some(memory_used) =
|
||||||
|
|
|
||||||
|
|
@ -168,7 +168,7 @@ impl Application for Todos {
|
||||||
.size(30)
|
.size(30)
|
||||||
.on_submit(Message::CreateTask);
|
.on_submit(Message::CreateTask);
|
||||||
|
|
||||||
let controls = controls.view(&tasks, *filter);
|
let controls = controls.view(tasks, *filter);
|
||||||
let filtered_tasks =
|
let filtered_tasks =
|
||||||
tasks.iter().filter(|task| filter.matches(task));
|
tasks.iter().filter(|task| filter.matches(task));
|
||||||
|
|
||||||
|
|
@ -493,15 +493,15 @@ struct SavedState {
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum LoadError {
|
enum LoadError {
|
||||||
FileError,
|
File,
|
||||||
FormatError,
|
Format,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum SaveError {
|
enum SaveError {
|
||||||
FileError,
|
File,
|
||||||
WriteError,
|
Write,
|
||||||
FormatError,
|
Format,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
|
@ -512,7 +512,7 @@ impl SavedState {
|
||||||
{
|
{
|
||||||
project_dirs.data_dir().into()
|
project_dirs.data_dir().into()
|
||||||
} else {
|
} else {
|
||||||
std::env::current_dir().unwrap_or(std::path::PathBuf::new())
|
std::env::current_dir().unwrap_or_default()
|
||||||
};
|
};
|
||||||
|
|
||||||
path.push("todos.json");
|
path.push("todos.json");
|
||||||
|
|
@ -527,37 +527,37 @@ impl SavedState {
|
||||||
|
|
||||||
let mut file = async_std::fs::File::open(Self::path())
|
let mut file = async_std::fs::File::open(Self::path())
|
||||||
.await
|
.await
|
||||||
.map_err(|_| LoadError::FileError)?;
|
.map_err(|_| LoadError::File)?;
|
||||||
|
|
||||||
file.read_to_string(&mut contents)
|
file.read_to_string(&mut contents)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| LoadError::FileError)?;
|
.map_err(|_| LoadError::File)?;
|
||||||
|
|
||||||
serde_json::from_str(&contents).map_err(|_| LoadError::FormatError)
|
serde_json::from_str(&contents).map_err(|_| LoadError::Format)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn save(self) -> Result<(), SaveError> {
|
async fn save(self) -> Result<(), SaveError> {
|
||||||
use async_std::prelude::*;
|
use async_std::prelude::*;
|
||||||
|
|
||||||
let json = serde_json::to_string_pretty(&self)
|
let json = serde_json::to_string_pretty(&self)
|
||||||
.map_err(|_| SaveError::FormatError)?;
|
.map_err(|_| SaveError::Format)?;
|
||||||
|
|
||||||
let path = Self::path();
|
let path = Self::path();
|
||||||
|
|
||||||
if let Some(dir) = path.parent() {
|
if let Some(dir) = path.parent() {
|
||||||
async_std::fs::create_dir_all(dir)
|
async_std::fs::create_dir_all(dir)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::FileError)?;
|
.map_err(|_| SaveError::File)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
let mut file = async_std::fs::File::create(path)
|
let mut file = async_std::fs::File::create(path)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::FileError)?;
|
.map_err(|_| SaveError::File)?;
|
||||||
|
|
||||||
file.write_all(json.as_bytes())
|
file.write_all(json.as_bytes())
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::WriteError)?;
|
.map_err(|_| SaveError::Write)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is a simple way to save at most once every couple seconds
|
// This is a simple way to save at most once every couple seconds
|
||||||
|
|
|
||||||
|
|
@ -54,16 +54,11 @@ impl Sandbox for Example {
|
||||||
tooltip::Position::Right,
|
tooltip::Position::Right,
|
||||||
);
|
);
|
||||||
|
|
||||||
let fixed_tooltips = Row::with_children(vec![
|
let fixed_tooltips = Row::with_children(vec![top, bottom, left, right])
|
||||||
top.into(),
|
.width(Length::Fill)
|
||||||
bottom.into(),
|
.height(Length::Fill)
|
||||||
left.into(),
|
.align_items(Alignment::Center)
|
||||||
right.into(),
|
.spacing(50);
|
||||||
])
|
|
||||||
.width(Length::Fill)
|
|
||||||
.height(Length::Fill)
|
|
||||||
.align_items(Alignment::Center)
|
|
||||||
.spacing(50);
|
|
||||||
|
|
||||||
let follow_cursor = tooltip(
|
let follow_cursor = tooltip(
|
||||||
"Tooltip follows cursor",
|
"Tooltip follows cursor",
|
||||||
|
|
@ -78,7 +73,7 @@ impl Sandbox for Example {
|
||||||
.center_x()
|
.center_x()
|
||||||
.center_y()
|
.center_y()
|
||||||
.into(),
|
.into(),
|
||||||
follow_cursor.into(),
|
follow_cursor,
|
||||||
])
|
])
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ impl Application for App {
|
||||||
|
|
||||||
fn view(&mut self) -> Element<Message> {
|
fn view(&mut self) -> Element<Message> {
|
||||||
let content = match &self.url {
|
let content = match &self.url {
|
||||||
Some(url) => Text::new(format!("{}", url)),
|
Some(url) => Text::new(url),
|
||||||
None => Text::new("No URL received yet!"),
|
None => Text::new("No URL received yet!"),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ pub fn connect() -> Subscription<Event> {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
let _ = tokio::time::sleep(
|
tokio::time::sleep(
|
||||||
tokio::time::Duration::from_secs(1),
|
tokio::time::Duration::from_secs(1),
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
@ -79,6 +79,7 @@ pub fn connect() -> Subscription<Event> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
#[allow(clippy::large_enum_variant)]
|
||||||
enum State {
|
enum State {
|
||||||
Disconnected,
|
Disconnected,
|
||||||
Connected(
|
Connected(
|
||||||
|
|
@ -101,8 +102,7 @@ pub struct Connection(mpsc::Sender<Message>);
|
||||||
|
|
||||||
impl Connection {
|
impl Connection {
|
||||||
pub fn send(&mut self, message: Message) {
|
pub fn send(&mut self, message: Message) {
|
||||||
let _ = self
|
self.0
|
||||||
.0
|
|
||||||
.try_send(message)
|
.try_send(message)
|
||||||
.expect("Send message to echo server");
|
.expect("Send message to echo server");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,9 @@ use warp::Filter;
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
pub async fn run() {
|
pub async fn run() {
|
||||||
let routes = warp::path::end().and(warp::ws()).map(|ws: warp::ws::Ws| {
|
let routes = warp::path::end()
|
||||||
ws.on_upgrade(move |socket| user_connected(socket))
|
.and(warp::ws())
|
||||||
});
|
.map(|ws: warp::ws::Ws| ws.on_upgrade(user_connected));
|
||||||
|
|
||||||
warp::serve(routes).run(([127, 0, 0, 1], 3030)).await;
|
warp::serve(routes).run(([127, 0, 0, 1], 3030)).await;
|
||||||
}
|
}
|
||||||
|
|
@ -40,7 +40,7 @@ async fn user_connected(ws: WebSocket) {
|
||||||
|
|
||||||
tokio::task::spawn(async move {
|
tokio::task::spawn(async move {
|
||||||
while let Some(message) = rx.next().await {
|
while let Some(message) = rx.next().await {
|
||||||
let _ = user_ws_tx.send(message).await.unwrap_or_else(|e| {
|
user_ws_tx.send(message).await.unwrap_or_else(|e| {
|
||||||
eprintln!("websocket send error: {}", e);
|
eprintln!("websocket send error: {}", e);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,6 @@ impl Backend {
|
||||||
glow_glyph::VerticalAlign::Bottom
|
glow_glyph::VerticalAlign::Bottom
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
..Default::default()
|
|
||||||
};
|
};
|
||||||
|
|
||||||
self.text_pipeline.queue(text);
|
self.text_pipeline.queue(text);
|
||||||
|
|
|
||||||
|
|
@ -116,14 +116,7 @@ impl Pipeline {
|
||||||
// TODO: Remove this allocation (or allocate only when needed)
|
// TODO: Remove this allocation (or allocate only when needed)
|
||||||
let indices: Vec<i32> = (0..instances.len().min(MAX_QUADS) as i32)
|
let indices: Vec<i32> = (0..instances.len().min(MAX_QUADS) as i32)
|
||||||
.flat_map(|i| {
|
.flat_map(|i| {
|
||||||
[
|
[i * 4, 1 + i * 4, 2 + i * 4, 2 + i * 4, 1 + i * 4, 3 + i * 4]
|
||||||
0 + i * 4,
|
|
||||||
1 + i * 4,
|
|
||||||
2 + i * 4,
|
|
||||||
2 + i * 4,
|
|
||||||
1 + i * 4,
|
|
||||||
3 + i * 4,
|
|
||||||
]
|
|
||||||
})
|
})
|
||||||
.cycle()
|
.cycle()
|
||||||
.take(instances.len() * 6)
|
.take(instances.len() * 6)
|
||||||
|
|
|
||||||
|
|
@ -37,3 +37,9 @@ impl Source {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for Source {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -151,3 +151,9 @@ impl Builder {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for Builder {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -53,12 +53,12 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>>
|
impl<'a, Message, B, T> From<QRCode<'a>>
|
||||||
for QRCode<'a>
|
for Element<'a, Message, Renderer<B, T>>
|
||||||
where
|
where
|
||||||
B: Backend,
|
B: Backend,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
|
fn from(qr_code: QRCode<'a>) -> Self {
|
||||||
Element::new(self)
|
Self::new(qr_code)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -125,13 +125,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>>
|
impl<'a, Message, B, T> From<QRCode<'a>>
|
||||||
for QRCode<'a>
|
for Element<'a, Message, Renderer<B, T>>
|
||||||
where
|
where
|
||||||
B: Backend,
|
B: Backend,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
|
fn from(qr_code: QRCode<'a>) -> Self {
|
||||||
Element::new(self)
|
Self::new(qr_code)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,9 @@ pub trait GLCompositor: Sized {
|
||||||
/// Creates a new [`GLCompositor`] and [`Renderer`] with the given
|
/// Creates a new [`GLCompositor`] and [`Renderer`] with the given
|
||||||
/// [`Settings`] and an OpenGL address loader function.
|
/// [`Settings`] and an OpenGL address loader function.
|
||||||
///
|
///
|
||||||
|
/// # Safety
|
||||||
|
/// The `loader_function` should resolve to valid OpenGL bindings.
|
||||||
|
///
|
||||||
/// [`Renderer`]: crate::Renderer
|
/// [`Renderer`]: crate::Renderer
|
||||||
/// [`Backend`]: crate::Backend
|
/// [`Backend`]: crate::Backend
|
||||||
/// [`Settings`]: Self::Settings
|
/// [`Settings`]: Self::Settings
|
||||||
|
|
|
||||||
|
|
@ -396,7 +396,7 @@ where
|
||||||
&mut local_shell,
|
&mut local_shell,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| iced_native::event::Status::Ignored);
|
.unwrap_or(iced_native::event::Status::Ignored);
|
||||||
|
|
||||||
local_shell.revalidate_layout(|| shell.invalidate_layout());
|
local_shell.revalidate_layout(|| shell.invalidate_layout());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,11 @@
|
||||||
clippy::useless_conversion
|
clippy::useless_conversion
|
||||||
)]
|
)]
|
||||||
#![forbid(unsafe_code)]
|
#![forbid(unsafe_code)]
|
||||||
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
#![allow(
|
||||||
|
clippy::await_holding_refcell_ref,
|
||||||
|
clippy::inherent_to_string,
|
||||||
|
clippy::type_complexity
|
||||||
|
)]
|
||||||
#![cfg_attr(docsrs, feature(doc_cfg))]
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
pub mod component;
|
pub mod component;
|
||||||
pub mod responsive;
|
pub mod responsive;
|
||||||
|
|
|
||||||
|
|
@ -428,7 +428,7 @@ where
|
||||||
&mut local_shell,
|
&mut local_shell,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| iced_native::event::Status::Ignored);
|
.unwrap_or(iced_native::event::Status::Ignored);
|
||||||
|
|
||||||
local_shell.revalidate_layout(|| shell.invalidate_layout());
|
local_shell.revalidate_layout(|| shell.invalidate_layout());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -383,6 +383,6 @@ where
|
||||||
shell,
|
shell,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| iced_native::event::Status::Ignored)
|
.unwrap_or(iced_native::event::Status::Ignored)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -224,7 +224,7 @@ where
|
||||||
where
|
where
|
||||||
R: Deref<Target = Renderer>,
|
R: Deref<Target = Renderer>,
|
||||||
{
|
{
|
||||||
self.content.resolve(&mut self.state, renderer, f)
|
self.content.resolve(self.state, renderer, f)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -405,6 +405,6 @@ where
|
||||||
shell,
|
shell,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| iced_native::event::Status::Ignored)
|
.unwrap_or(iced_native::event::Status::Ignored)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -186,6 +186,12 @@ impl Debug {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for Debug {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct TimeBuffer {
|
struct TimeBuffer {
|
||||||
head: usize,
|
head: usize,
|
||||||
|
|
|
||||||
|
|
@ -280,13 +280,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<iced_native::Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Pure<'a, Message, Renderer>>
|
||||||
for Pure<'a, Message, Renderer>
|
for iced_native::Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> iced_native::Element<'a, Message, Renderer> {
|
fn from(pure: Pure<'a, Message, Renderer>) -> Self {
|
||||||
iced_native::Element::new(self)
|
Self::new(pure)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -159,7 +159,7 @@ where
|
||||||
self.height,
|
self.height,
|
||||||
self.padding,
|
self.padding,
|
||||||
|renderer, limits| {
|
|renderer, limits| {
|
||||||
self.content.as_widget().layout(renderer, &limits)
|
self.content.as_widget().layout(renderer, limits)
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -261,14 +261,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Button<'a, Message, Renderer>>
|
||||||
for Button<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: Clone + 'a,
|
Message: Clone + 'a,
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(button: Button<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(button)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -96,14 +96,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Checkbox<'a, Message, Renderer>>
|
||||||
for Checkbox<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(checkbox: Checkbox<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(checkbox)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,12 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer> {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
||||||
for Column<'a, Message, Renderer>
|
for Column<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
|
|
@ -228,13 +234,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Column<'a, Message, Renderer>>
|
||||||
for Column<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(column: Column<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(column)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,14 +56,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer, Handle> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer, Handle> From<Image<Handle>>
|
||||||
for Image<Handle>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: Clone + 'a,
|
Message: Clone + 'a,
|
||||||
Renderer: iced_native::image::Renderer<Handle = Handle> + 'a,
|
Renderer: iced_native::image::Renderer<Handle = Handle> + 'a,
|
||||||
Handle: Clone + Hash + 'a,
|
Handle: Clone + Hash + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(image: Image<Handle>) -> Self {
|
||||||
Element::new(self)
|
Self::new(image)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -225,8 +225,8 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, T: 'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, T: 'a, Message, Renderer> From<PickList<'a, T, Message, Renderer>>
|
||||||
for PickList<'a, T, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
T: Clone + ToString + Eq + 'static,
|
T: Clone + ToString + Eq + 'static,
|
||||||
[T]: ToOwned<Owned = Vec<T>>,
|
[T]: ToOwned<Owned = Vec<T>>,
|
||||||
|
|
@ -234,7 +234,7 @@ where
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(pick_list: PickList<'a, T, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(pick_list)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
|
||||||
|
|
||||||
pub use iced_native::widget::progress_bar::*;
|
pub use iced_native::widget::progress_bar::*;
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer>
|
impl<Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer,
|
Renderer: iced_native::Renderer,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
|
|
@ -93,13 +93,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<ProgressBar<Renderer>>
|
||||||
for ProgressBar<Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(progress_bar: ProgressBar<Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(progress_bar)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -96,14 +96,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Radio<Message, Renderer>>
|
||||||
for Radio<Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a + Clone,
|
Message: 'a + Clone,
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(radio: Radio<Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(radio)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,12 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a, Message, Renderer> Default for Row<'a, Message, Renderer> {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
||||||
for Row<'a, Message, Renderer>
|
for Row<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
|
|
@ -215,13 +221,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Row<'a, Message, Renderer>>
|
||||||
for Row<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(row: Row<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(row)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
|
||||||
|
|
||||||
pub use iced_native::widget::rule::*;
|
pub use iced_native::widget::rule::*;
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for Rule<Renderer>
|
impl<Message, Renderer> Widget<Message, Renderer> for Rule<Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer,
|
Renderer: iced_native::Renderer,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
|
|
@ -93,13 +93,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Rule<Renderer>>
|
||||||
for Rule<Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(rule: Rule<Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(rule)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
|
||||||
|
|
||||||
pub use iced_native::widget::Space;
|
pub use iced_native::widget::Space;
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for Space
|
impl<Message, Renderer> Widget<Message, Renderer> for Space
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer,
|
Renderer: iced_native::Renderer,
|
||||||
{
|
{
|
||||||
|
|
@ -91,11 +91,11 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Space
|
impl<'a, Message, Renderer> From<Space> for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(space: Space) -> Self {
|
||||||
Element::new(self)
|
Self::new(space)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -54,12 +54,12 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Svg
|
impl<'a, Message, Renderer> From<Svg> for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: Clone + 'a,
|
Message: Clone + 'a,
|
||||||
Renderer: iced_native::svg::Renderer + 'a,
|
Renderer: iced_native::svg::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(svg: Svg) -> Self {
|
||||||
Element::new(self)
|
Self::new(svg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,23 +55,23 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Text<Renderer>>
|
||||||
for Text<Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: widget::text::StyleSheet,
|
Renderer::Theme: widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(text: Text<Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(text)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for &'a str
|
impl<'a, Message, Renderer> From<&'a str> for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: widget::text::StyleSheet,
|
Renderer::Theme: widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(contents: &'a str) -> Self {
|
||||||
Text::new(self).into()
|
Text::new(contents).into()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -96,14 +96,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Toggler<'a, Message, Renderer>>
|
||||||
for Toggler<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(toggler: Toggler<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(toggler)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -215,6 +215,7 @@ pub trait Application: Sized {
|
||||||
where
|
where
|
||||||
Self: 'static,
|
Self: 'static,
|
||||||
{
|
{
|
||||||
|
#[allow(clippy::needless_update)]
|
||||||
let renderer_settings = crate::renderer::Settings {
|
let renderer_settings = crate::renderer::Settings {
|
||||||
default_font: settings.default_font,
|
default_font: settings.default_font,
|
||||||
default_text_size: settings.default_text_size,
|
default_text_size: settings.default_text_size,
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ impl Cache {
|
||||||
if let Memory::Host(image) = memory {
|
if let Memory::Host(image) = memory {
|
||||||
let (width, height) = image.dimensions();
|
let (width, height) = image.dimensions();
|
||||||
|
|
||||||
let entry = atlas.upload(width, height, &image, device, encoder)?;
|
let entry = atlas.upload(width, height, image, device, encoder)?;
|
||||||
|
|
||||||
*memory = Memory::Device(entry);
|
*memory = Memory::Device(entry);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue