Skip to content

Commit

Permalink
Auto merge of #1075 - msiglreith:pr_macro, r=kvark
Browse files Browse the repository at this point in the history
Fix pipeline definition macro

`use $crate;` is not allowed due to recent restrictions and `use super::*;` won't import the gfx crate. (allowed in future but feature gated rust-lang/rfcs#1560)

Closes #1070
  • Loading branch information
homu committed Nov 1, 2016
2 parents 4d9c45d + 8c70b3c commit 2ae195f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/render/src/macros/pso.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ macro_rules! gfx_pipeline_base {
$( $field:ident: $ty:ty, )*
}) => {
pub mod $module {
use $crate;
#[allow(unused_imports)]
use super::*;
use super::gfx;
gfx_pipeline_inner!{ $(
$field: $ty,
)*}
Expand All @@ -242,9 +242,9 @@ macro_rules! gfx_pipeline {
$( $field:ident: $ty:ty = $value:expr, )*
}) => {
pub mod $module {
use $crate;
#[allow(unused_imports)]
use super::*;
use super::gfx;
gfx_pipeline_inner!{ $(
$field: $ty,
)*}
Expand Down

0 comments on commit 2ae195f

Please sign in to comment.