Rename module

rust-phf · Jul 13, 2014 · 25aeba6 · 25aeba6
1 parent 6372fa4
commit 25aeba6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/phf/src/lib.rs b/phf/src/lib.rs
@@ -15,7 +15,7 @@ use std::slice;
 use std::collections::Collection;
 
 #[path="../../shared/mod.rs"]
-mod phf_shared;
+mod shared;
 
 /// An immutable map constructed at compile time.
 ///
@@ -86,9 +86,9 @@ impl<K: fmt::Show, V: fmt::Show> fmt::Show for PhfMap<K, V> {
 impl<K: Hash+Eq, V> PhfMap<K, V> {
     fn get_entry<'a, T: Hash>(&'a self, key: &T, check: |&K| -> bool)
                               -> Option<&'a (K, V)> {
-        let (g, f1, f2) = phf_shared::hash(key, self.k1, self.k2);
+        let (g, f1, f2) = shared::hash(key, self.k1, self.k2);
         let (d1, d2) = self.disps[g % self.disps.len()];
-        let entry @ &(ref s, _) = &self.entries[phf_shared::displace(f1, f2, d1, d2) %
+        let entry @ &(ref s, _) = &self.entries[shared::displace(f1, f2, d1, d2) %
                                                 self.entries.len()];
         if check(s) {
             Some(entry)
@@ -406,9 +406,9 @@ impl<'a, K: Hash+Eq, V> Map<K, V> for PhfOrderedMap<K, V> {
 
 impl<K: Hash+Eq, V> PhfOrderedMap<K, V> {
     fn find_entry<'a>(&'a self, key: &K) -> Option<&'a (K, V)> {
-        let (g, f1, f2) = phf_shared::hash(key, self.k1, self.k2);
+        let (g, f1, f2) = shared::hash(key, self.k1, self.k2);
         let (d1, d2) = self.disps[g % self.disps.len()];
-        let idx = self.idxs[phf_shared::displace(f1, f2, d1, d2) % self.idxs.len()];
+        let idx = self.idxs[shared::displace(f1, f2, d1, d2) % self.idxs.len()];
         let entry @ &(ref s, _) = &self.entries[idx];
 
         if s == key {

diff --git a/phf_mac/src/lib.rs b/phf_mac/src/lib.rs
@@ -31,7 +31,7 @@ use rand::{Rng, SeedableRng, XorShiftRng};
 use rustc::plugin::Registry;
 
 #[path="../../shared/mod.rs"]
-mod phf_shared;
+mod shared;
 
 static DEFAULT_LAMBDA: uint = 5;
 
@@ -190,10 +190,10 @@ fn parse_map(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
         }
     }
 
-    if entries.len() > phf_shared::MAX_SIZE {
+    if entries.len() > shared::MAX_SIZE {
         cx.span_err(parser.span,
                     format!("maps with more than {} entries are not supported",
-                            phf_shared::MAX_SIZE).as_slice());
+                            shared::MAX_SIZE).as_slice());
         return None;
     }
 
@@ -230,10 +230,10 @@ fn parse_set(cx: &mut ExtCtxt, tts: &[TokenTree]) -> Option<Vec<Entry>> {
         }
     }
 
-    if entries.len() > phf_shared::MAX_SIZE {
+    if entries.len() > shared::MAX_SIZE {
         cx.span_err(parser.span,
                     format!("maps with more than {} entries are not supported",
-                            phf_shared::MAX_SIZE).as_slice());
+                            shared::MAX_SIZE).as_slice());
         return None;
     }
 
@@ -338,7 +338,7 @@ fn try_generate_hash(entries: &[Entry], rng: &mut XorShiftRng)
     let k2 = rng.gen();
 
     let hashes: Vec<Hashes> = entries.iter().map(|entry| {
-        let (g, f1, f2) = phf_shared::hash(&entry.key_contents, k1, k2);
+        let (g, f1, f2) = shared::hash(&entry.key_contents, k1, k2);
         Hashes {
             g: g,
             f1: f1,
@@ -366,10 +366,10 @@ fn try_generate_hash(entries: &[Entry], rng: &mut XorShiftRng)
             'disps: for d2 in range(0, table_len) {
                 try_map.clear();
                 for &key in bucket.keys.iter() {
-                    let idx = phf_shared::displace(hashes.get(key).f1,
-                                                   hashes.get(key).f2,
-                                                   d1,
-                                                   d2) % table_len;
+                    let idx = shared::displace(hashes.get(key).f1,
+                                               hashes.get(key).f2,
+                                               d1,
+                                               d2) % table_len;
                     if map.get(idx).is_some() || try_map.find(&idx).is_some() {
                         continue 'disps;
                     }