Upgrade to rust 2018

rukai · Dec 6, 2018 · d425ced · d425ced
1 parent 4f94d46
commit d425ced
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "vulkano_text"
 version = "0.9.0"
+edition = "2018"
 authors = ["Rukai <rubickent@gmail.com>"]
 description = "Render text with the DejaVu font using the Vulkano library."
 license = "MIT"

diff --git a/examples/stress_test.rs b/examples/stress_test.rs
@@ -1,8 +1,3 @@
-#[macro_use]
-extern crate vulkano;
-extern crate winit;
-extern crate vulkano_win;
-extern crate vulkano_text;
 use vulkano_text::{DrawText, DrawTextTrait};
 
 use vulkano::command_buffer::AutoCommandBufferBuilder;
@@ -141,7 +136,7 @@ fn main() {
     };
 
     // include a depth buffer (unlike triangle.rs) to ensure vulkano-text isnt dependent on a specific render_pass
-    let render_pass = Arc::new(single_pass_renderpass!(
+    let render_pass = Arc::new(vulkano::single_pass_renderpass!(
         device.clone(),
         attachments: {
             color: {

diff --git a/examples/triangle.rs b/examples/triangle.rs
@@ -1,14 +1,7 @@
 // Any difference in code from vulkano triangle.rs example is noted with ALL CAPS COMMENT BLOCKS
 // The formatting is different though.
 
-#[macro_use]
-extern crate vulkano;
-extern crate vulkano_shaders;
-extern crate winit;
-extern crate vulkano_win;
-
 // IMPORT
-extern crate vulkano_text;
 use vulkano_text::{DrawText, DrawTextTrait};
 // IMPORT END
 
@@ -99,7 +92,7 @@ fn main() {
     let vertex_buffer = {
         #[derive(Debug, Clone)]
         struct Vertex { position: [f32; 2] }
-        impl_vertex!(Vertex, position);
+        vulkano::impl_vertex!(Vertex, position);
 
         CpuAccessibleBuffer::from_iter(device.clone(), BufferUsage::all(), [
             // BIGGER TRIANGLE
@@ -113,7 +106,7 @@ fn main() {
     let vs = vs::Shader::load(device.clone()).unwrap();
     let fs = fs::Shader::load(device.clone()).unwrap();
 
-    let render_pass = Arc::new(single_pass_renderpass!(
+    let render_pass = Arc::new(vulkano::single_pass_renderpass!(
         device.clone(),
         attachments: {
             color: {

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,7 +1,3 @@
-#[macro_use] extern crate vulkano;
-extern crate vulkano_shaders;
-extern crate rusttype;
-
 use rusttype::{Font, PositionedGlyph, Scale, Rect, point};
 use rusttype::gpu_cache::Cache;
 
@@ -28,7 +24,7 @@ struct Vertex {
     tex_position: [f32; 2],
     color:        [f32; 4]
 }
-impl_vertex!(Vertex, position, tex_position, color);
+vulkano::impl_vertex!(Vertex, position, tex_position, color);
 
 mod vs {
     vulkano_shaders::shader!{
@@ -74,7 +70,7 @@ impl DrawText {
         let cache = Cache::builder().dimensions(CACHE_WIDTH as u32, CACHE_HEIGHT as u32).build();
         let cache_pixel_buffer = vec!(0; CACHE_WIDTH * CACHE_HEIGHT);
 
-        let render_pass = Arc::new(single_pass_renderpass!(device.clone(),
+        let render_pass = Arc::new(vulkano::single_pass_renderpass!(device.clone(),
             attachments: {
                 color: {
                     load: Load,