Merge branch 'LoganDark-2018'

Cargo.toml

@@ -4,6 +4,7 @@ version = "0.8.0"
 authors = ["shivshank"]
 description = "Quick and easy window creation, input, and high speed bitmap rendering"
 repository = "https://github.com/shivshank/mini_gl_fb"
+edition = "2018"
 
 license = "MIT"
 

src/breakout.rs

@@ -2,7 +2,7 @@
 //! [`Framebuffer`] object and manipulate them directly.
 
 use glutin::{WindowedContext, PossiblyCurrent, ContextError};
-use core::Framebuffer;
+use crate::core::Framebuffer;
 
 use std::collections::HashMap;
 use glutin::event::{MouseButton, VirtualKeyCode, ModifiersState};

src/config.rs

@@ -32,9 +32,9 @@ use glutin::dpi::LogicalSize;
 ///
 /// If there's a config option you want to see or think is missing, please open an issue!
 #[non_exhaustive]
+#[derive(Clone, PartialEq, Debug, Builder)]
 #[builder(default)]
 #[builder(build_fn(skip))]
-#[derive(Clone, PartialEq, Debug, Builder)]
 pub struct Config {
     /// Sets the pixel dimensions of the buffer. The buffer will automatically stretch to fill the
     /// whole window. By default this will be the same as the window_size.

src/core.rs

@@ -1,4 +1,4 @@
-use breakout::{GlutinBreakout, BasicInput};
+use crate::breakout::{GlutinBreakout, BasicInput};
 
 use rustic_gl;
 

src/lib.rs

@@ -117,9 +117,9 @@ pub mod breakout;
 
 pub use breakout::{GlutinBreakout, BasicInput};
 pub use config::{Config, ConfigBuilder};
-pub use core::{Internal, BufferFormat, Framebuffer};
+pub use crate::core::{Internal, BufferFormat, Framebuffer};
 
-use core::ToGlType;
+use crate::core::ToGlType;
 use glutin::event_loop::EventLoop;
 use glutin::dpi::LogicalSize;