Skip to content
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.

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

Use namespaced enums #19

Merged
merged 1 commit into from
Nov 19, 2014
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions generator/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extern crate syntax;
extern crate url;

use phf_mac::util as phf;
use phf_mac::util::{Entry, KeyStr};
use phf_mac::util::{Entry, Key};
use rustc::plugin::Registry;
use syntax::{ast, codemap, parse};
use syntax::ast::{CookedStr, LitStr};
Expand Down Expand Up @@ -84,7 +84,7 @@ fn expand(cx: &mut ExtCtxt, sp: codemap::Span, tts: &[ast::TokenTree]) -> Box<Ma
fn generate_entry(cx: &ExtCtxt, sp: codemap::Span, ext: &str, type_: &str, subtype: &str) -> Entry {
// The key
let key = str_to_lit(cx, sp, ext);
let key_contents = KeyStr(token::intern_and_get_ident(ext));
let key_contents = Key::Str(token::intern_and_get_ident(ext));

// The raw media type
let raw_media_type = generate_media_type(cx, sp, type_, subtype);
Expand Down