Skip to content

Commit b18153d

Browse files
GyulyVGCJoylei
authored andcommitted
fix warnings and optimize imports
1 parent 643a088 commit b18153d

File tree

8 files changed

+34
-29
lines changed

8 files changed

+34
-29
lines changed

examples/cpu-monitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ impl Chart<Message> for CpuUsageChart {
290290
}
291291

292292
fn build_chart<DB: DrawingBackend>(&self, _state: &Self::State, mut chart: ChartBuilder<DB>) {
293-
use plotters::{prelude::*, style::Color};
293+
use plotters::prelude::*;
294294

295295
const PLOT_LINE_COLOR: RGBColor = RGBColor(0, 175, 255);
296296

examples/large-data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl Chart<Message> for ExampleChart {
193193
}
194194

195195
fn build_chart<DB: DrawingBackend>(&self, _state: &Self::State, mut chart: ChartBuilder<DB>) {
196-
use plotters::{prelude::*, style::Color};
196+
use plotters::prelude::*;
197197

198198
const PLOT_LINE_COLOR: RGBColor = RGBColor(0, 175, 255);
199199

src/backend/mod.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// Copyright: 2022, Joylei <[email protected]>
55
// License: MIT
66

7-
use crate::error::Error;
8-
use crate::utils::{cvt_color, cvt_stroke, CvtPoint};
7+
use std::collections::HashSet;
8+
99
use iced_widget::{
1010
canvas,
1111
core::{
@@ -16,6 +16,7 @@ use iced_widget::{
1616
use once_cell::unsync::Lazy;
1717
use plotters_backend::{
1818
text_anchor,
19+
//FontTransform,
1920
BackendColor,
2021
BackendCoord,
2122
BackendStyle,
@@ -24,9 +25,10 @@ use plotters_backend::{
2425
DrawingErrorKind,
2526
FontFamily,
2627
FontStyle,
27-
//FontTransform,
2828
};
29-
use std::collections::HashSet;
29+
30+
use crate::error::Error;
31+
use crate::utils::{cvt_color, cvt_stroke, CvtPoint};
3032

3133
/// The Iced drawing backend
3234
pub(crate) struct IcedChartBackend<'a, B> {

src/chart.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ where
3131
type State = C::State;
3232
#[inline]
3333
fn build_chart<DB: DrawingBackend>(&self, state: &Self::State, builder: ChartBuilder<DB>) {
34-
C::build_chart(self, state, builder)
34+
C::build_chart(self, state, builder);
3535
}
3636
#[inline]
3737
fn draw_chart<DB: DrawingBackend>(&self, state: &Self::State, root: DrawingArea<DB, Shift>) {
38-
C::draw_chart(self, state, root)
38+
C::draw_chart(self, state, root);
3939
}
4040
#[inline]
4141
fn draw<R: Renderer, F: Fn(&mut Frame)>(&self, renderer: &R, size: Size, f: F) -> Geometry {

src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub enum Error {}
1313

1414
impl fmt::Display for Error {
1515
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
16-
write!(fmt, "{:?}", self)
16+
write!(fmt, "{self:?}")
1717
}
1818
}
1919

src/lib.rs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,26 @@
5454
#![warn(missing_docs)]
5555

5656
pub extern crate plotters_backend;
57-
mod backend;
58-
mod chart;
59-
mod error;
60-
mod renderer;
61-
/// data point sampling
62-
pub mod sample;
63-
mod utils;
64-
mod widget;
57+
58+
#[doc(no_inline)]
59+
pub use plotters::{chart::ChartBuilder, drawing::DrawingArea};
60+
#[doc(no_inline)]
61+
pub use plotters_backend::DrawingBackend;
6562

6663
#[doc(inline)]
6764
pub use chart::Chart;
6865
#[doc(inline)]
6966
pub use chart::Renderer;
70-
7167
#[doc(inline)]
7268
pub use error::Error;
73-
74-
#[doc(no_inline)]
75-
pub use plotters::{chart::ChartBuilder, drawing::DrawingArea};
76-
#[doc(no_inline)]
77-
pub use plotters_backend::DrawingBackend;
78-
7969
/// Chart container, turns [`Chart`]s to [`iced_native::Widget`]s
8070
pub use widget::ChartWidget;
71+
72+
mod backend;
73+
mod chart;
74+
mod error;
75+
mod renderer;
76+
/// data point sampling
77+
pub mod sample;
78+
mod utils;
79+
mod widget;

src/renderer.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
// Copyright: 2022, Joylei <[email protected]>
55
// License: MIT
66

7-
use crate::backend::IcedChartBackend;
8-
use crate::Chart;
97
use iced_widget::{
108
canvas::{Cache, Frame},
119
core::{Layout, Size, Vector},
1210
renderer::Geometry,
1311
};
1412
use plotters::prelude::DrawingArea;
1513

14+
use crate::backend::IcedChartBackend;
15+
use crate::Chart;
16+
1617
/// Graphics Renderer
1718
pub trait Renderer:
1819
iced_widget::core::Renderer + iced_widget::core::text::Renderer + iced_graphics::geometry::Renderer
@@ -52,6 +53,6 @@ impl<Theme> Renderer for iced_widget::renderer::Renderer<Theme> {
5253
let translation = Vector::new(bounds.x, bounds.y);
5354
iced_widget::core::Renderer::with_translation(self, translation, |renderer| {
5455
iced_graphics::geometry::Renderer::draw(renderer, vec![geometry]);
55-
})
56+
});
5657
}
5758
}

src/widget.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
// Copyright: 2022, Joylei <[email protected]>
55
// License: MIT
66

7-
use super::Chart;
8-
use crate::renderer::Renderer;
97
use core::marker::PhantomData;
8+
109
use iced_widget::{
1110
canvas::Event,
1211
core::{
@@ -18,6 +17,10 @@ use iced_widget::{
1817
},
1918
};
2019

20+
use crate::renderer::Renderer;
21+
22+
use super::Chart;
23+
2124
/// Chart container, turns [`Chart`]s to [`Widget`]s
2225
pub struct ChartWidget<'a, Message, Renderer, C>
2326
where

0 commit comments

Comments
 (0)