Skip to content

Commit 000c930

Browse files
committed
Update to latest rust nightly
The exact version is rustc 0.13.0-dev (0b7b4f075 2014-11-16 22:36:50 +0000) and the relevant upstream issues are rust-lang/rust#18752 and rust-lang/rust#18976. Fixes gfx-rs#439.
1 parent a387828 commit 000c930

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

examples/performance/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use std::mem;
3737
use std::ptr;
3838
use std::str;
3939
use std::os;
40-
use std::from_str::FromStr;
40+
use std::str::FromStr;
4141

4242
#[vertex_format]
4343
struct Vertex {

src/gfx_macros/shader_param.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ fn method_create(cx: &mut ext::base::ExtCtxt, span: codemap::Span,
125125
},
126126
_ => {
127127
cx.span_err(span, "Unable to implement `ShaderParam::create_link()` on a non-structure");
128-
cx.expr_lit(span, ast::LitNil)
128+
cx.expr_tuple(span, vec![])
129129
},
130130
}
131131
}
@@ -203,7 +203,7 @@ fn method_fill(cx: &mut ext::base::ExtCtxt, span: codemap::Span,
203203
},
204204
_ => {
205205
cx.span_err(span, "Unable to implement `ShaderParam::bind()` on a non-structure");
206-
cx.expr_lit(span, ast::LitNil)
206+
cx.expr_tuple(span, vec![])
207207
}
208208
}
209209
}

src/gfx_macros/vertex_format.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
use std::fmt;
16-
use std::from_str::FromStr;
16+
use std::str::FromStr;
1717
use syntax::{ast, ext};
1818
use syntax::ext::build::AstBuilder;
1919
use syntax::ext::deriving::generic;
@@ -131,12 +131,12 @@ fn decode_type(cx: &mut ext::base::ExtCtxt, span: codemap::Span,
131131
not supported, but found: `{}`. Use an \
132132
integer component with an explicit size \
133133
instead.", ty_str).as_slice());
134-
cx.expr_lit(span, ast::LitNil)
134+
cx.expr_tuple(span, vec![])
135135
},
136136
ty_str => {
137137
cx.span_err(span, format!("Unrecognized component type: `{}`",
138138
ty_str).as_slice());
139-
cx.expr_lit(span, ast::LitNil)
139+
cx.expr_tuple(span, vec![])
140140
},
141141
}
142142
}
@@ -157,13 +157,13 @@ fn decode_count_and_type(cx: &mut ext::base::ExtCtxt, span: codemap::Span,
157157
_ => {
158158
cx.span_err(span, format!("Unsupported fixed vector sub-type: \
159159
`{}`",pty.node).as_slice());
160-
cx.expr_lit(span, ast::LitNil)
160+
cx.expr_tuple(span, vec![])
161161
},
162162
}),
163163
_ => {
164164
cx.span_err(span, format!("Unsupported attribute type: `{}`",
165165
field.node.ty.node).as_slice());
166-
(cx.expr_lit(span, ast::LitNil), cx.expr_lit(span, ast::LitNil))
166+
(cx.expr_tuple(span, vec![]), cx.expr_tuple(span, vec![]))
167167
},
168168
}
169169
}
@@ -218,7 +218,7 @@ fn method_body(cx: &mut ext::base::ExtCtxt, span: codemap::Span,
218218
_ => {
219219
cx.span_err(span, "Unable to implement `gfx::VertexFormat::generate` \
220220
on a non-structure");
221-
cx.expr_lit(span, ast::LitNil)
221+
cx.expr_tuple(span, vec![])
222222
}
223223
}
224224
}

0 commit comments

Comments
 (0)