Switch to Rusr 2018!

Removes all those ugly 'extern crate' and 'macro_use' lines...

diff --git a/Cargo.toml b/Cargo.toml
index 9d5e78f2dde0059d99e276e5a03944a3367061f5..72fc70e60a4fa909727dbec6429822f2d3445960 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ name = "mandelwow"
 version = "0.7.0"
 authors = ["Bernie Innocenti <bernie@codewiz.org>"]
 license = "GPL-3.0+"
-#edition = '2018'
+edition = '2018'
 
 [profile.release]
 lto = true

diff --git a/benches/bounding_box.rs b/benches/bounding_box.rs
index be448a7000b02722c9469782ab6b301a2766c3e4..54351d9534c674f92e907cf70eed81dd6203e8db 100644 (file)
--- a/benches/bounding_box.rs
+++ b/benches/bounding_box.rs
@@ -1,11 +1,7 @@
 #![feature(test)]
-
-extern crate mandelwow_lib;
-extern crate glutin;
-#[macro_use(uniform)]
-extern crate glium;
 extern crate test;
 
+use glium::uniform;
 use mandelwow_lib::Cube;
 use mandelwow_lib::bounding_box::*;
 

diff --git a/benches/shaded_cube.rs b/benches/shaded_cube.rs
index 501976b8d15d5e32064d080e4cdff03380d7949f..842e290286cfb441cf8cf2b018ac78e1c2a67b3d 100644 (file)
--- a/benches/shaded_cube.rs
+++ b/benches/shaded_cube.rs
@@ -1,11 +1,7 @@
 #![feature(test)]
-
-extern crate mandelwow_lib;
-#[macro_use(uniform)]
-extern crate glium;
-extern crate glutin;
 extern crate test;
 
+use glium::uniform;
 use mandelwow_lib::shaded_cube::*;
 
 #[bench]

diff --git a/bounding_box.rs b/bounding_box.rs
index 5cc4b18c0c5d6b0cf1eee9e69f933ebca5b05f4b..71cee762518b0c1e0e107c79ea88d7458d5ce1af 100644 (file)
--- a/bounding_box.rs
+++ b/bounding_box.rs
@@ -1,6 +1,6 @@
 use crate::cube::Cube;
 use glium;
-use glium::{Display, Program, Surface};
+use glium::{Display, Program, Surface, implement_vertex};
 use glium::index::{IndexBuffer, PrimitiveType};
 
 pub fn solid_fill_program(display: &Display) -> Program {

diff --git a/lib.rs b/lib.rs
index 5366202cba37a4f4f44d4351f66b7679681bc0a6..c923d0831fbd8e6dd14f374df4fc3dbb7dc906fd 100644 (file)
--- a/lib.rs
+++ b/lib.rs
@@ -1,14 +1,3 @@
-extern crate cgmath;
-#[macro_use(uniform,implement_vertex)]
-extern crate glium;
-extern crate glutin;
-#[cfg(feature = "image")]
-extern crate image;
-extern crate libxm;
-#[cfg(feature = "editor")]
-extern crate rust_rocket;
-extern crate sdl2;
-
 pub mod bounding_box;
 pub mod cube;
 pub mod mandelwow;
@@ -24,7 +13,7 @@ pub use crate::shaded_cube::ShadedCube;
 
 #[cfg(feature = "image")]
 pub fn screenshot(display : &glium::Display) {
-    let image: glium::texture::RawImage2d<u8> = display.read_front_buffer();
+    let image: glium::texture::RawImage2d<'_, u8> = display.read_front_buffer();
     let image = image::ImageBuffer::from_raw(image.width, image.height, image.data.into_owned()).unwrap();
     let image = image::DynamicImage::ImageRgba8(image).flipv().to_rgb();
     let image = image::DynamicImage::ImageRgb8(image);

diff --git a/main.rs b/main.rs
index 426bfb12ee398d4dce19ab227ddcc2810ae8c0dd..1ad2eea7d77b543a34cfd1cbb7b258e03bf2da55 100644 (file)
--- a/main.rs
+++ b/main.rs
@@ -1,15 +1,8 @@
-extern crate mandelwow_lib;
-
-extern crate cgmath;
-#[macro_use(uniform)]
-extern crate glium;
-extern crate glutin;
-
 use cgmath::conv::array4x4;
 use cgmath::{Euler, Matrix4, Rad, SquareMatrix, Vector3, Vector4, Zero};
 use glium::glutin::VirtualKeyCode;
 use glium::glutin::WindowEvent::KeyboardInput;
-use glium::Surface;
+use glium::{Surface, uniform};
 use mandelwow_lib::*;
 use std::f32::consts::PI;
 use crate::timer::Timer;

diff --git a/mandelwow.rs b/mandelwow.rs
index 9b236a57965581942a213acb1e690d8582d6b2cc..1a6516c36f1266e991d916f419e5de0329d63d5d 100644 (file)
--- a/mandelwow.rs
+++ b/mandelwow.rs
@@ -3,7 +3,7 @@
 use crate::cube::Cube;
 use glium;
 use glium::index::PrimitiveType;
-use glium::{Display, Program, Surface};
+use glium::{Display, Program, Surface, implement_vertex, uniform};
 use crate::support;
 
 /*

diff --git a/shaded_cube.rs b/shaded_cube.rs
index 9194d7c8a986002591983ded73d97027ccae1d8a..6019a12702d6932aada4dc73d58d5d79d200a4df 100644 (file)
--- a/shaded_cube.rs
+++ b/shaded_cube.rs
@@ -1,5 +1,5 @@
 use glium;
-use glium::{Display, Program, Surface};
+use glium::{Display, Program, Surface, implement_vertex};
 use glium::index::{IndexBuffer, PrimitiveType};
 
 pub fn shaded_program(display: &Display) -> Program {

diff --git a/text.rs b/text.rs
index 4e1fcdfc10579f3ed5813005795bc11bb3a7bfc4..c341959c55beb7ab678969f57b45c821e0c1c1bd 100644 (file)
--- a/text.rs
+++ b/text.rs
@@ -1,7 +1,7 @@
 use cgmath::conv::array4x4;
 use cgmath::{Matrix4, Vector3};
 use glium;
-use glium::{Display, Program, Surface, texture};
+use glium::{Display, Program, Surface, implement_vertex, texture, uniform};
 use std;
 
 fn gamma<T>(x: T) -> f32
@@ -63,7 +63,7 @@ pub struct Text<'a> {
 }
 
 impl<'a> Text<'a> {
-    pub fn new(display: &Display, character: char) -> Text {
+    pub fn new(display: &Display, character: char) -> Text<'_> {
         let (w, h, pixels) = c64_font();
         let image = glium::texture::RawImage2d {
             data: std::borrow::Cow::from(pixels),