diff --git a/Cargo.toml b/Cargo.toml index 93a1892..330b24a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ name = "steven" version = "0.0.1" authors = [ "Thinkofdeath " ] +edition = "2018" [profile.dev] # Steven runs horrendously slow with no optimizations, and often freezes. diff --git a/blocks/Cargo.toml b/blocks/Cargo.toml index 213f9bf..dda7d1f 100644 --- a/blocks/Cargo.toml +++ b/blocks/Cargo.toml @@ -2,6 +2,7 @@ name = "steven_blocks" version = "0.0.1" authors = [ "Thinkofdeath " ] +edition = "2018" [dependencies] lazy_static = "1.1.0" diff --git a/blocks/src/lib.rs b/blocks/src/lib.rs index bc4ecec..26761d1 100644 --- a/blocks/src/lib.rs +++ b/blocks/src/lib.rs @@ -7,7 +7,7 @@ extern crate collision; extern crate lazy_static; extern crate steven_shared as shared; -use shared::{Axis, Direction, Position}; +use crate::shared::{Axis, Direction, Position}; use collision::Aabb3; use cgmath::Point3; diff --git a/gl/Cargo.toml b/gl/Cargo.toml index 42ebd96..5e8750b 100644 --- a/gl/Cargo.toml +++ b/gl/Cargo.toml @@ -2,6 +2,7 @@ name = "steven_gl" version = "0.0.1" authors = [ "Thinkofdeath " ] +edition = "2018" build = "build.rs" [build-dependencies] diff --git a/resources/Cargo.toml b/resources/Cargo.toml index 24710bc..aea6370 100644 --- a/resources/Cargo.toml +++ b/resources/Cargo.toml @@ -2,4 +2,5 @@ name = "steven_resources" version = "0.1.0" authors = [ "Thinkofdeath " ] +edition = "2018" build = "build.rs" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index e630410..d79e8ae 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -2,5 +2,6 @@ name = "steven_shared" version = "0.0.1" authors = [ "Thinkofdeath " ] +edition = "2018" [dependencies] diff --git a/shared/src/direction.rs b/shared/src/direction.rs index 6b23f36..0c6b7cd 100644 --- a/shared/src/direction.rs +++ b/shared/src/direction.rs @@ -1,5 +1,5 @@ -use axis::Axis; +use crate::axis::Axis; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum Direction { diff --git a/shared/src/lib.rs b/shared/src/lib.rs index b72a910..a1b09fe 100644 --- a/shared/src/lib.rs +++ b/shared/src/lib.rs @@ -1,9 +1,9 @@ pub mod axis; -pub use axis::Axis; +pub use self::axis::Axis; pub mod direction; -pub use direction::Direction; +pub use self::direction::Direction; pub mod position; -pub use position::Position; +pub use self::position::Position; diff --git a/shared/src/position.rs b/shared/src/position.rs index cd450ac..a823202 100644 --- a/shared/src/position.rs +++ b/shared/src/position.rs @@ -1,6 +1,6 @@ use std::fmt; -use direction::Direction; +use crate::direction::Direction; use std::ops; #[derive(Clone, Copy, PartialEq, Eq, Hash)]