Merge pull request #69 from servo/conflicting-rawptr-mut-send

kmcallister · kmcallister · commit 96f539b6e633 · 2015-02-26T13:10:54.000-08:00
Upgrade to rustc 1.0.0-nightly (4db0b3246 2015-02-25) (built 2015-02-26)
diff --git a/examples/event-log/Cargo.toml b/examples/event-log/Cargo.toml
@@ -5,5 +5,5 @@ version = "0.0.0"
 authors = [ "The Servo Project Developers" ]
 
 [dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
+path = "../.."
 features = ["log-events"]
diff --git a/examples/summarize-events/Cargo.toml b/examples/summarize-events/Cargo.toml
@@ -9,4 +9,4 @@ csv = "0"
 rustc-serialize = "0"
 
 [dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
+path = "../.."
diff --git a/src/atom/mod.rs b/src/atom/mod.rs
@@ -56,7 +56,7 @@ struct StringCacheEntry {
     string: String,
 }
 
-unsafe impl Send for *mut StringCacheEntry { }
+unsafe impl Send for StringCache { }
 
 impl StringCacheEntry {
     fn new(next: *mut StringCacheEntry, hash: u64, string_to_add: &str) -> StringCacheEntry {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ struct StringCacheEntry {`
`56`	`56`	`string: String,`
`57`	`57`	`}`
`58`	`58`
`59`		`-unsafe impl Send for *mut StringCacheEntry { }`
	`59`	`+unsafe impl Send for StringCache { }`
`60`	`60`
`61`	`61`	`impl StringCacheEntry {`
`62`	`62`	`fn new(next: *mut StringCacheEntry, hash: u64, string_to_add: &str) -> StringCacheEntry {`