Merge pull request #7 from swiftcoder/2018

swiftcoder · web-flow · commit a1bbb8b70b8e · 2020-06-18T08:28:54.000-07:00
2018 edition cleanup
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ license = "Apache-2.0"
 description = "Isosurface extraction algorithms"
 repository = "https://github.com/swiftcoder/isosurface"
 readme = "README.md"
-edition = '2018'
+edition = "2018"
 
 [dev-dependencies]
 glium = "^0.26"
diff --git a/examples/deferred_rasterisation.rs b/examples/deferred_rasterisation.rs
@@ -19,9 +19,9 @@ extern crate isosurface;
 
 mod common;
 
+use crate::common::reinterpret_cast_slice;
+use crate::common::sources::Torus;
 use cgmath::{vec3, Matrix4, Point3, SquareMatrix};
-use common::reinterpret_cast_slice;
-use common::sources::Torus;
 use glium::glutin;
 use glium::glutin::{
     dpi::LogicalSize,
diff --git a/examples/torus.rs b/examples/torus.rs
@@ -20,10 +20,10 @@ extern crate isosurface;
 
 mod common;
 
+use crate::common::reinterpret_cast_slice;
+use crate::common::sources::{CubeSphere, Torus};
+use crate::common::text::layout_text;
 use cgmath::{vec3, Matrix4, Point3};
-use common::reinterpret_cast_slice;
-use common::sources::{CubeSphere, Torus};
-use common::text::layout_text;
 use glium::backend::Facade;
 use glium::draw_parameters::PolygonMode;
 use glium::glutin;
