Auto merge of #165 - servo:default--partialeq-string, r=nox

bors-servo · web-flow · commit 12008ae33c53 · 2016-07-22T09:09:26.000-05:00
Implement Default and PartialEq<String>. This is part of the changes proposed at servo/servo#12391 (comment)  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/string-cache/165)
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "string_cache"
-version = "0.2.21"
+version = "0.2.22"
 authors = [ "The Servo Project Developers" ]
 description = "A string interning library for Rust, developed as part of the Servo project."
 license = "MIT / Apache-2.0"
diff --git a/src/atom/mod.rs b/src/atom/mod.rs
@@ -203,6 +203,12 @@ impl Atom {
     }
 }
 
+impl Default for Atom {
+    fn default() -> Self {
+        atom!("")
+    }
+}
+
 impl PartialEq<str> for Atom {
     fn eq(&self, other: &str) -> bool {
         &self[..] == other
@@ -215,6 +221,12 @@ impl PartialEq<Atom> for str {
     }
 }
 
+impl PartialEq<String> for Atom {
+    fn eq(&self, other: &String) -> bool {
+        &self[..] == &other[..]
+    }
+}
+
 impl<'a> From<Cow<'a, str>> for Atom {
     #[inline]
     fn from(string_to_add: Cow<'a, str>) -> Atom {
diff --git a/src/namespace.rs b/src/namespace.rs
@@ -15,7 +15,7 @@ use std::ops;
 /// An atom that is meant to represent a namespace in the HTML / XML sense.
 /// Whether a given string represents a namespace is contextual, so this is
 /// a transparent wrapper that will not catch all mistakes.
-#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Clone, Default)]
 #[cfg_attr(feature = "heap_size", derive(HeapSizeOf))]
 pub struct Namespace(pub Atom);
 

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,12 @@ impl Atom {`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
	`206`	`+impl Default for Atom {`
	`207`	`+ fn default() -> Self {`
	`208`	`+ atom!("")`
	`209`	`+ }`
	`210`	`+}`
	`211`	`+`
`206`	`212`	`impl PartialEq<str> for Atom {`
`207`	`213`	`fn eq(&self, other: &str) -> bool {`
`208`	`214`	`&self[..] == other`
`@@ -215,6 +221,12 @@ impl PartialEq<Atom> for str {`
`215`	`221`	`}`
`216`	`222`	`}`
`217`	`223`
	`224`	`+impl PartialEq<String> for Atom {`
	`225`	`+ fn eq(&self, other: &String) -> bool {`
	`226`	`+ &self[..] == &other[..]`
	`227`	`+ }`
	`228`	`+}`
	`229`	`+`
`218`	`230`	`impl<'a> From<Cow<'a, str>> for Atom {`
`219`	`231`	`#[inline]`
`220`	`232`	`fn from(string_to_add: Cow<'a, str>) -> Atom {`