Skip to content

Fix gfx_macros #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Feb 8, 2015
Merged

Fix gfx_macros #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gfx_macros/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn find_name(cx: &mut ext::base::ExtCtxt, span: codemap::Span,
attributes.iter().fold(None, |name, attribute| {
match attribute.node.value.node {
ast::MetaNameValue(ref attr_name, ref attr_value) => {
match (attr_name.get(), &attr_value.node) {
match (&attr_name[], &attr_value.node) {
("name", &ast::LitStr(ref new_name, _)) => {
attr::mark_used(attribute);
name.map_or(Some(new_name.clone()), |name| {
Expand Down
4 changes: 2 additions & 2 deletions src/gfx_macros/vertex_format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ fn find_modifier(cx: &mut ext::base::ExtCtxt, span: codemap::Span,
attributes.iter().fold(None, |modifier, attribute| {
match attribute.node.value.node {
ast::MetaWord(ref word) => {
word.get().parse().ok().and_then(|new_modifier| {
word.parse().ok().and_then(|new_modifier| {
attr::mark_used(attribute);
modifier.map_or(Some(new_modifier), |modifier| {
cx.span_warn(span, &format!(
Expand Down Expand Up @@ -179,7 +179,7 @@ fn method_body(cx: &mut ext::base::ExtCtxt, span: codemap::Span,
Some(name) => name,
None => token::get_ident(ident),
};
let ident_str = ident_str.get();
let ident_str = &ident_str[];
let instance_expr = cx.expr_u8(span, 0); // not supposed to be set by the macro
quote_expr!(cx, {
attributes.push($path_root::gfx::Attribute {
Expand Down