Use phf_codegen instead of phf_macros

SimonSapin · SimonSapin · commit 917dd80098ba · 2015-07-24T23:10:34.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "string_cache"
-version = "0.1.6"
+version = "0.1.7"
 authors = [ "The Servo Project Developers" ]
 description = "A string interning library for Rust, developed as part of the Servo project."
 license = "MIT / Apache-2.0"
@@ -22,8 +22,6 @@ log-events = ["rustc-serialize"]
 
 [dependencies]
 rand = "0"
-phf = "0.7"
-phf_macros = "0.7"
 lazy_static = "0.1.10"
 serde = "0.4.2"
 
diff --git a/plugin/src/atom/mod.rs b/plugin/src/atom/mod.rs
@@ -18,17 +18,6 @@ use std::iter::Chain;
 use std::collections::HashMap;
 use std::ascii::AsciiExt;
 
-mod data;
-
-// Build a PhfOrderedSet of static atoms.
-// Takes no arguments.
-pub fn expand_static_atom_set(cx: &mut ExtCtxt, sp: Span, tt: &[TokenTree]) -> Box<MacResult+'static> {
-    ext_bail_if!(tt.len() != 0, cx, sp, "Usage: static_atom_map!()");
-    let tts: Vec<TokenTree> = data::ATOMS.iter().flat_map(|k| {
-        (quote_tokens!(&mut *cx, $k,)).into_iter()
-    }).collect();
-    MacEager::expr(quote_expr!(&mut *cx, phf_ordered_set!($tts)))
-}
 
 fn atom_tok_to_str(t: &TokenTree) -> Option<InternedString> {
     Some(get_ident(match *t {
@@ -38,17 +27,6 @@ fn atom_tok_to_str(t: &TokenTree) -> Option<InternedString> {
     }))
 }
 
-// Build a map from atoms to IDs for use in implementing the atom!() macro.
-lazy_static! {
-    static ref STATIC_ATOM_MAP: HashMap<&'static str, usize> = {
-        let mut m = HashMap::new();
-        for (i, x) in data::ATOMS.iter().enumerate() {
-            m.insert(*x, i);
-        }
-        m
-    };
-}
-
 // FIXME: libsyntax should provide this (rust-lang/rust#17637)
 struct AtomResult {
     expr: P<ast::Expr>,
@@ -66,12 +44,12 @@ impl MacResult for AtomResult {
 }
 
 fn make_atom_result(cx: &mut ExtCtxt, name: &str) -> Option<AtomResult> {
-    let i = match STATIC_ATOM_MAP.get(name) {
+    let i = match ::string_cache_shared::STATIC_ATOM_SET.get_index(name) {
         Some(i) => i,
         None => return None,
     };
 
-    let data = ::string_cache_shared::pack_static(*i as u32);
+    let data = ::string_cache_shared::pack_static(i as u32);
 
     Some(AtomResult {
         expr: quote_expr!(&mut *cx, ::string_cache::atom::Atom { data: $data }),
diff --git a/plugin/src/lib.rs b/plugin/src/lib.rs
@@ -33,7 +33,6 @@ mod atom;
 // NB: This needs to be public or we get a linker error.
 #[plugin_registrar]
 pub fn plugin_registrar(reg: &mut Registry) {
-    reg.register_macro("static_atom_set", atom::expand_static_atom_set);
     reg.register_macro("atom", atom::expand_atom);
     reg.register_macro("ns", atom::expand_ns);
 }
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -6,6 +6,7 @@ authors = [ "The Servo Project Developers" ]
 description = "A string interning library for Rust, developed as part of the Servo project − shared code between the compiler plugin and main crate."
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/string-cache"
+build = "build.rs"
 
 [lib]
 
@@ -14,3 +15,7 @@ path = "lib.rs"
 
 [dependencies]
 debug_unreachable = "0.0.5"
+phf = "0.7.3"
+
+[build-dependencies]
+phf_codegen = "0.7.3"
diff --git a/shared/build.rs b/shared/build.rs
@@ -0,0 +1,20 @@
+extern crate phf_codegen;
+
+mod static_atom_list;
+
+use std::fs::File;
+use std::io::{BufWriter, Write};
+use std::path::Path;
+
+fn main() {
+    let mut set = phf_codegen::OrderedSet::new();
+    for &atom in static_atom_list::ATOMS {
+        set.entry(atom);
+    }
+
+    let path = Path::new(env!("OUT_DIR")).join("static_atom_set.rs");
+    let mut file = BufWriter::new(File::create(&path).unwrap());
+    write!(&mut file, "pub static STATIC_ATOM_SET: phf::OrderedSet<&'static str> = ").unwrap();
+    set.build(&mut file).unwrap();
+    write!(&mut file, ";\n").unwrap();
+}
diff --git a/shared/lib.rs b/shared/lib.rs
@@ -14,12 +14,15 @@
 #![deny(warnings)]
 
 #[macro_use] extern crate debug_unreachable;
+extern crate phf;
 
 use std::ptr;
 use std::slice;
 
 pub use self::UnpackedAtom::{Dynamic, Inline, Static};
 
+include!(concat!(env!("OUT_DIR"), "/static_atom_set.rs"));
+
 // FIXME(rust-lang/rust#18153): generate these from an enum
 pub const DYNAMIC_TAG: u8 = 0u8;
 pub const INLINE_TAG: u8 = 1u8;  // len in upper nybble
diff --git a/shared/static_atom_list.rs b/shared/static_atom_list.rs
diff --git a/src/atom/mod.rs b/src/atom/mod.rs
@@ -9,7 +9,6 @@
 
 #![allow(non_upper_case_globals)]
 
-use phf::OrderedSet;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use std::fmt;
@@ -25,7 +24,7 @@ use std::sync::Mutex;
 use std::sync::atomic::AtomicIsize;
 use std::sync::atomic::Ordering::SeqCst;
 
-use string_cache_shared::{self, UnpackedAtom, Static, Inline, Dynamic};
+use string_cache_shared::{self, UnpackedAtom, Static, Inline, Dynamic, STATIC_ATOM_SET};
 
 #[cfg(feature = "log-events")]
 use event::Event;
@@ -37,8 +36,6 @@ macro_rules! log (($e:expr) => (()));
 // Needed for memory safety of the tagging scheme!
 const ENTRY_ALIGNMENT: usize = 16;
 
-// Macro-generated table for static atoms.
-static static_atom_set: OrderedSet<&'static str> = static_atom_set!();
 
 struct StringCache {
     buckets: [*mut StringCacheEntry; 4096],
@@ -173,7 +170,7 @@ impl Atom {
 
     #[inline]
     pub fn from_slice(string_to_add: &str) -> Atom {
-        let unpacked = match static_atom_set.get_index(string_to_add) {
+        let unpacked = match STATIC_ATOM_SET.get_index(string_to_add) {
             Some(id) => Static(id as u32),
             None => {
                 let len = string_to_add.len();
@@ -200,7 +197,7 @@ impl Atom {
                     let buf = string_cache_shared::inline_orig_bytes(&self.data);
                     str::from_utf8(buf).unwrap()
                 },
-                Static(idx) => *static_atom_set.index(idx as usize).expect("bad static atom"),
+                Static(idx) => *STATIC_ATOM_SET.index(idx as usize).expect("bad static atom"),
                 Dynamic(entry) => {
                     let entry = entry as *mut StringCacheEntry;
                     &(*entry).string
diff --git a/src/lib.rs b/src/lib.rs
@@ -15,13 +15,11 @@
 #![deny(warnings)]
 #![cfg_attr(test, feature(test))]
 #![cfg_attr(bench, feature(rand))]
-#![plugin(phf_macros, string_cache_plugin)]
+#![plugin(string_cache_plugin)]
 
 #[cfg(test)]
 extern crate test;
 
-extern crate phf;
-
 #[macro_use]
 extern crate lazy_static;
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ mod atom;`
`33`	`33`	`// NB: This needs to be public or we get a linker error.`
`34`	`34`	`#[plugin_registrar]`
`35`	`35`	`pub fn plugin_registrar(reg: &mut Registry) {`
`36`		`- reg.register_macro("static_atom_set", atom::expand_static_atom_set);`
`37`	`36`	`reg.register_macro("atom", atom::expand_atom);`
`38`	`37`	`reg.register_macro("ns", atom::expand_ns);`
`39`	`38`	`}`