Publish on cartes.io

Author: SimonSapin

Cargo.toml

@@ -1,8 +1,11 @@
 [package]
 
 name = "string_cache"
-version = "0.0.0"
+version = "0.1.0"
 authors = [ "The Servo Project Developers" ]
+description = "A string interning library for Rust, developed as part of the Servo project."
+license = "MIT / Apache-2.0"
+repository = "https://github.com/servo/string-cache"
 
 [lib]
 name = "string_cache"
@@ -28,3 +31,8 @@ optional = true
 
 [dependencies.string_cache_plugin]
 path = "plugin"
+version = "0.1.1"
+
+[dependencies.string_cache_shared]
+path = "shared"
+version = "0.1.0"

plugin/Cargo.toml

@@ -1,14 +1,21 @@
 [package]
 
 name = "string_cache_plugin"
-version = "0.0.0"
+version = "0.1.1"
 authors = [ "The Servo Project Developers" ]
+description = "A string interning library for Rust, developed as part of the Servo project − compiler plugin."
+license = "MIT / Apache-2.0"
+repository = "https://github.com/servo/string-cache"
 
 [lib]
 
 name = "string_cache_plugin"
 plugin = true
 
+[dependencies.string_cache_shared]
+path = "../shared"
+version = "0.1.0"
+
 [dependencies]
 lazy_static = "0.1.10"
 mac = "0.0.2"

plugin/src/atom/mod.rs

@@ -20,9 +20,6 @@ use std::ascii::AsciiExt;
 
 mod data;
 
-#[path="../../../shared/repr.rs"]
-mod repr;
-
 // 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> {
@@ -74,7 +71,7 @@ fn make_atom_result(cx: &mut ExtCtxt, name: &str) -> Option<AtomResult> {
         None => return None,
     };
 
-    let data = repr::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 }),

plugin/src/lib.rs

@@ -11,7 +11,7 @@
 #![crate_type="dylib"]
 
 #![feature(plugin_registrar, quote, box_syntax, static_assert)]
-#![feature(rustc_private, core, slice_patterns)]
+#![feature(rustc_private, slice_patterns)]
 #![deny(warnings)]
 #![allow(unused_imports)]  // for quotes
 
@@ -24,6 +24,8 @@ extern crate lazy_static;
 #[macro_use]
 extern crate mac;
 
+extern crate string_cache_shared;
+
 use rustc::plugin::Registry;
 
 mod atom;

shared/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+
+name = "string_cache_shared"
+version = "0.1.0"
+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"
+
+[lib]
+
+name = "string_cache_shared"
+path = "lib.rs"

shared/repr.rs renamed to shared/lib.rs

@@ -11,7 +11,8 @@
 //! the macros crate and the run-time library, in order to guarantee
 //! consistency.
 
-#![allow(dead_code, unused_imports)]
+#![feature(core, static_assert)]
+#![deny(warnings)]
 
 use std::{mem, raw, intrinsics};
 use std::slice::bytes;
@@ -44,7 +45,7 @@ const STATIC_SHIFT_BITS: usize = 32;
 #[inline(always)]
 unsafe fn inline_atom_slice(x: &u64) -> raw::Slice<u8> {
     #[static_assert]
-    const IS_LITTLE_ENDIAN: bool = cfg!(target_endian = "little");
+    const _IS_LITTLE_ENDIAN: bool = cfg!(target_endian = "little");
 
     let x: *const u64 = x;
     raw::Slice {
@@ -82,7 +83,7 @@ impl UnpackedAtom {
     #[inline(always)]
     pub unsafe fn from_packed(data: u64) -> UnpackedAtom {
         #[static_assert]
-        const DYNAMIC_IS_UNTAGGED: bool = DYNAMIC_TAG == 0;
+        const _DYNAMIC_IS_UNTAGGED: bool = DYNAMIC_TAG == 0;
 
         match (data & 0xf) as u8 {
             DYNAMIC_TAG => Dynamic(data as *mut ()),

src/atom/bench.rs

@@ -135,7 +135,7 @@ macro_rules! bench_all (
             use std::iter::repeat;
 
             use atom::Atom;
-            use atom::repr::{Static, Inline, Dynamic};
+            use string_cache_shared::{Static, Inline, Dynamic};
 
             use super::mk;
 

src/atom/mod.rs

@@ -24,16 +24,14 @@ use std::sync::Mutex;
 use std::sync::atomic::AtomicIsize;
 use std::sync::atomic::Ordering::SeqCst;
 
-use self::repr::{UnpackedAtom, Static, Inline, Dynamic};
+use string_cache_shared::{self, UnpackedAtom, Static, Inline, Dynamic};
 
 #[cfg(feature = "log-events")]
 use event::Event;
 
 #[cfg(not(feature = "log-events"))]
 macro_rules! log (($e:expr) => (()));
 
-#[path="../../shared/repr.rs"]
-pub mod repr;
 
 // Needed for memory safety of the tagging scheme!
 const ENTRY_ALIGNMENT: usize = 16;
@@ -178,7 +176,7 @@ impl Atom {
             Some(id) => Static(id as u32),
             None => {
                 let len = string_to_add.len();
-                if len <= repr::MAX_INLINE_LEN {
+                if len <= string_cache_shared::MAX_INLINE_LEN {
                     let mut buf: [u8; 7] = [0; 7];
                     bytes::copy_memory(string_to_add.as_bytes(), &mut buf);
                     Inline(len as u8, buf)
@@ -198,7 +196,7 @@ impl Atom {
         unsafe {
             match self.unpack() {
                 Inline(..) => {
-                    let buf = repr::inline_orig_bytes(&self.data);
+                    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"),
@@ -215,7 +213,7 @@ impl Clone for Atom {
     #[inline(always)]
     fn clone(&self) -> Atom {
         unsafe {
-            match repr::from_packed_dynamic(self.data) {
+            match string_cache_shared::from_packed_dynamic(self.data) {
                 Some(entry) => {
                     let entry = entry as *mut StringCacheEntry;
                     (*entry).ref_count.fetch_add(1, SeqCst);
@@ -238,7 +236,7 @@ impl Drop for Atom {
         }
 
         unsafe {
-            match repr::from_packed_dynamic(self.data) {
+            match string_cache_shared::from_packed_dynamic(self.data) {
                 // We use #[unsafe_no_drop_flag] so that Atom will be only 64
                 // bits.  That means we need to ignore a NULL pointer here,
                 // which represents a value that was moved out.
@@ -312,7 +310,7 @@ mod bench;
 mod tests {
     use std::thread;
     use super::Atom;
-    use super::repr::{Static, Inline, Dynamic};
+    use string_cache_shared::{Static, Inline, Dynamic};
 
     #[test]
     fn test_as_slice() {

src/lib.rs

@@ -30,6 +30,8 @@ extern crate rand;
 #[cfg(feature = "log-events")]
 extern crate rustc_serialize;
 
+extern crate string_cache_shared;
+
 pub use atom::Atom;
 pub use namespace::{Namespace, QualName};