From a885862cc3b66323bd8d3c449e2a4f913082a973 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Thu, 27 Dec 2018 21:13:15 +0700 Subject: [PATCH] Run 'cargo fix --edition' --- bounding_box.rs | 2 +- lib.rs | 6 +++--- main.rs | 6 +++--- mandelwow.rs | 4 ++-- support/camera.rs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bounding_box.rs b/bounding_box.rs index a08246e..5cc4b18 100644 --- a/bounding_box.rs +++ b/bounding_box.rs @@ -1,4 +1,4 @@ -use cube::Cube; +use crate::cube::Cube; use glium; use glium::{Display, Program, Surface}; use glium::index::{IndexBuffer, PrimitiveType}; diff --git a/lib.rs b/lib.rs index 3ec2b55..5366202 100644 --- a/lib.rs +++ b/lib.rs @@ -18,9 +18,9 @@ pub mod support; pub mod text; pub mod timer; -pub use bounding_box::BoundingBox; -pub use cube::Cube; -pub use shaded_cube::ShadedCube; +pub use crate::bounding_box::BoundingBox; +pub use crate::cube::Cube; +pub use crate::shaded_cube::ShadedCube; #[cfg(feature = "image")] pub fn screenshot(display : &glium::Display) { diff --git a/main.rs b/main.rs index 11ded82..426bfb1 100644 --- a/main.rs +++ b/main.rs @@ -12,7 +12,7 @@ use glium::glutin::WindowEvent::KeyboardInput; use glium::Surface; use mandelwow_lib::*; use std::f32::consts::PI; -use timer::Timer; +use crate::timer::Timer; #[cfg(target_os = "emscripten")] use std::os::raw::{c_int, c_void}; @@ -120,8 +120,8 @@ fn main() { let mut timer = Timer::new(); let mut camera = support::camera::CameraState::new(); - let mut bounding_box_enabled = true; - let mut fullscreen = true; + let bounding_box_enabled = true; + let _fullscreen = true; // These are the bounds of the 3D Mandelwow section which we render in 3-space. let bounds = Cube { diff --git a/mandelwow.rs b/mandelwow.rs index bbb3671..9b236a5 100644 --- a/mandelwow.rs +++ b/mandelwow.rs @@ -1,10 +1,10 @@ // Wow. Such fractal. -use cube::Cube; +use crate::cube::Cube; use glium; use glium::index::PrimitiveType; use glium::{Display, Program, Surface}; -use support; +use crate::support; /* fn mand(cx: f32, cy: f32) -> [f32; 3] { diff --git a/support/camera.rs b/support/camera.rs index 8460197..5ae1c8c 100644 --- a/support/camera.rs +++ b/support/camera.rs @@ -4,8 +4,8 @@ use glium; use glium::glutin::VirtualKeyCode; use std::f32; use std::f32::consts::PI; -use support::vec3::Vec3; -use support::vec3::norm; +use crate::support::vec3::Vec3; +use crate::support::vec3::norm; #[derive(Default)] pub struct CameraState { -- 2.25.1