Merge pull request #1195 from iced-rs/fix/vulnerabilities

Fix `cargo-audit` vulnerabilities
This commit is contained in:
Héctor Ramón 2022-01-14 13:50:30 +07:00 committed by GitHub
commit b7bc169120
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 53 additions and 94 deletions

View file

@ -7,4 +7,4 @@ publish = false
[dependencies]
iced = { path = "../..", features = ["canvas", "tokio", "debug"] }
chrono = "0.4"
time = { version = "0.3.5", features = ["local-offset"] }

View file

@ -1,7 +1,7 @@
use iced::{
canvas::{self, Cache, Canvas, Cursor, Geometry, LineCap, Path, Stroke},
executor, time, Application, Color, Command, Container, Element, Length,
Point, Rectangle, Settings, Subscription, Vector,
executor, Application, Color, Command, Container, Element, Length, Point,
Rectangle, Settings, Subscription, Vector,
};
pub fn main() -> iced::Result {
@ -12,13 +12,13 @@ pub fn main() -> iced::Result {
}
struct Clock {
now: chrono::DateTime<chrono::Local>,
now: time::OffsetDateTime,
clock: Cache,
}
#[derive(Debug, Clone, Copy)]
enum Message {
Tick(chrono::DateTime<chrono::Local>),
Tick(time::OffsetDateTime),
}
impl Application for Clock {
@ -29,7 +29,8 @@ impl Application for Clock {
fn new(_flags: ()) -> (Self, Command<Message>) {
(
Clock {
now: chrono::Local::now(),
now: time::OffsetDateTime::now_local()
.unwrap_or_else(|_| time::OffsetDateTime::now_utc()),
clock: Default::default(),
},
Command::none(),
@ -56,8 +57,12 @@ impl Application for Clock {
}
fn subscription(&self) -> Subscription<Message> {
time::every(std::time::Duration::from_millis(500))
.map(|_| Message::Tick(chrono::Local::now()))
iced::time::every(std::time::Duration::from_millis(500)).map(|_| {
Message::Tick(
time::OffsetDateTime::now_local()
.unwrap_or_else(|_| time::OffsetDateTime::now_utc()),
)
})
}
fn view(&mut self) -> Element<Message> {
@ -77,8 +82,6 @@ impl Application for Clock {
impl canvas::Program<Message> for Clock {
fn draw(&self, bounds: Rectangle, _cursor: Cursor) -> Vec<Geometry> {
use chrono::Timelike;
let clock = self.clock.draw(bounds.size(), |frame| {
let center = frame.center();
let radius = frame.width().min(frame.height()) / 2.0;
@ -126,7 +129,7 @@ impl canvas::Program<Message> for Clock {
}
}
fn hand_rotation(n: u32, total: u32) -> f32 {
fn hand_rotation(n: u8, total: u8) -> f32 {
let turns = n as f32 / total as f32;
2.0 * std::f32::consts::PI * turns

View file

@ -9,4 +9,8 @@ publish = false
iced = { path = "../..", features = ["tokio"] }
iced_native = { path = "../../native" }
iced_futures = { path = "../../futures" }
reqwest = "0.11"
[dependencies.reqwest]
version = "0.11"
default-features = false
features = ["rustls-tls"]

View file

@ -6,7 +6,7 @@ edition = "2018"
publish = false
[dependencies]
iced = { path = "../..", features = ["image", "debug", "tokio_old"] }
iced = { path = "../..", features = ["image", "debug", "tokio"] }
serde_json = "1.0"
[dependencies.serde]
@ -14,8 +14,9 @@ version = "1.0"
features = ["derive"]
[dependencies.reqwest]
version = "0.10.2"
features = ["json"]
version = "0.11"
default-features = false
features = ["json", "rustls-tls"]
[dependencies.rand]
version = "0.7"