Merge pull request #4642 from codeblack08/unwrap-pub

catamorphism · catamorphism · commit cf23ccf9b655 · 2013-01-25T18:04:17.000-08:00
Declare std::arc::unwrap to be pub
diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs
@@ -114,7 +114,7 @@ pub fn clone<T: Const Owned>(rc: &ARC<T>) -> ARC<T> {
  * unwrap from a task that holds another reference to the same ARC; it is
  * guaranteed to deadlock.
  */
-fn unwrap<T: Const Owned>(rc: ARC<T>) -> T {
+pub fn unwrap<T: Const Owned>(rc: ARC<T>) -> T {
     let ARC { x: x } = move rc;
     unsafe { unwrap_shared_mutable_state(move x) }
 }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ pub fn clone<T: Const Owned>(rc: &ARC<T>) -> ARC<T> {`
`114`	`114`	`* unwrap from a task that holds another reference to the same ARC; it is`
`115`	`115`	`* guaranteed to deadlock.`
`116`	`116`	`*/`
`117`		`-fn unwrap<T: Const Owned>(rc: ARC<T>) -> T {`
	`117`	`+pub fn unwrap<T: Const Owned>(rc: ARC<T>) -> T {`
`118`	`118`	`let ARC { x: x } = move rc;`
`119`	`119`	`unsafe { unwrap_shared_mutable_state(move x) }`
`120`	`120`	`}`