From 0dabe6d925ccd585601d935edfa23f54d6ba9c12 Mon Sep 17 00:00:00 2001 From: Hendrik Sollich Date: Thu, 20 Dec 2018 19:05:49 +0100 Subject: edition 2018 --- Cargo.toml | 1 + examples/tasks.rs | 3 --- examples/write.rs | 2 -- src/calendar.rs | 2 +- src/components.rs | 2 +- src/lib.rs | 13 ++++--------- src/properties.rs | 1 - 7 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 197dbcf..f0c3784 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ authors = ["Hendrik Sollich "] name = "icalendar" version = "0.4.0" license = "MIT/Apache-2.0" +edition = "2018" description = "Early, minimal icalendar crate." keywords = ["calendar", "ical", "ics"] diff --git a/examples/tasks.rs b/examples/tasks.rs index bdeea2d..b323123 100644 --- a/examples/tasks.rs +++ b/examples/tasks.rs @@ -1,6 +1,3 @@ - -extern crate icalendar; -extern crate chrono; use icalendar::*; use chrono::*; diff --git a/examples/write.rs b/examples/write.rs index a6488ad..2a0cca2 100644 --- a/examples/write.rs +++ b/examples/write.rs @@ -1,5 +1,3 @@ -extern crate chrono; -extern crate icalendar; use chrono::*; use icalendar::*; diff --git a/src/calendar.rs b/src/calendar.rs index f0c817b..0d09a0c 100644 --- a/src/calendar.rs +++ b/src/calendar.rs @@ -1,4 +1,4 @@ -use components::*; +use crate::components::*; use std::fmt; use std::ops::Deref; diff --git a/src/components.rs b/src/components.rs index 4cf50aa..7139e4b 100644 --- a/src/components.rs +++ b/src/components.rs @@ -6,7 +6,7 @@ use std::fmt; use std::mem; use std::collections::HashMap; -use properties::*; +use crate::properties::*; /// VEVENT [(RFC 5545, Section 3.6.1 )](https://tools.ietf.org/html/rfc5545#section-3.6.1) #[derive(Debug, Default)] diff --git a/src/lib.rs b/src/lib.rs index 9f2df81..fe9ee3b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -57,10 +57,6 @@ missing_debug_implementations )] -extern crate chrono; -extern crate uuid; -//extern crate vobject; - macro_rules! print_crlf { () => (print!("\r\n")); ($fmt:expr) => (print!(concat!($fmt, "\r\n"))); @@ -85,11 +81,10 @@ mod properties; mod calendar; //pub mod repeats; -pub use properties::{Property, Parameter, Class, ValueType}; -pub use properties::{TodoStatus, EventStatus}; -//pub use components::{event, todo}; -pub use components::{Event, Todo, Component}; -pub use calendar::Calendar; +pub use crate::properties::{Property, Parameter, Class, ValueType}; +pub use crate::properties::{TodoStatus, EventStatus}; +pub use crate::components::{Event, Todo, Component}; +pub use crate::calendar::Calendar; // TODO Calendar TimeZone VTIMEZONE STANDARD DAYLIGHT (see thunderbird exports) diff --git a/src/properties.rs b/src/properties.rs index 7e8c7f1..0cd7efb 100644 --- a/src/properties.rs +++ b/src/properties.rs @@ -1,7 +1,6 @@ use std::fmt::{self, Write}; use std::mem; use std::collections::HashMap; -use std::convert::Into; #[derive(Debug)] /// key-value pairs inside of `Property`s -- cgit v1.2.3