Correct issue-2804 test

nikomatsakis · nikomatsakis · commit 21951e503d14 · 2013-05-30T16:55:50.000-04:00
diff --git a/src/test/run-pass/issue-2804.rs b/src/test/run-pass/issue-2804.rs
@@ -25,9 +25,9 @@ fn lookup(table: ~json::Object, key: ~str, default: ~str) -> ~str
 {
     match table.find(&key)
     {
-        option::Some(&extra::json::String(copy s)) =>
+        option::Some(&extra::json::String(ref s)) =>
         {
-            copy s
+            copy *s
         }
         option::Some(value) =>
         {
@@ -45,9 +45,9 @@ fn add_interface(store: int, managed_ip: ~str, data: extra::json::Json) -> (~str
 {
     match &data
     {
-        &extra::json::Object(copy interface) =>
+        &extra::json::Object(ref interface) =>
         {
-            let name = lookup(copy interface, ~"ifDescr", ~"");
+            let name = lookup(copy *interface, ~"ifDescr", ~"");
             let label = fmt!("%s-%s", managed_ip, name);
 
             (label, bool_value(false))

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ fn lookup(table: ~json::Object, key: ~str, default: ~str) -> ~str`
`25`	`25`	`{`
`26`	`26`	`match table.find(&key)`
`27`	`27`	`{`
`28`		`- option::Some(&extra::json::String(copy s)) =>`
	`28`	`+ option::Some(&extra::json::String(ref s)) =>`
`29`	`29`	`{`
`30`		`- copy s`
	`30`	`+ copy *s`
`31`	`31`	`}`
`32`	`32`	`option::Some(value) =>`
`33`	`33`	`{`
`@@ -45,9 +45,9 @@ fn add_interface(store: int, managed_ip: ~str, data: extra::json::Json) -> (~str`
`45`	`45`	`{`
`46`	`46`	`match &data`
`47`	`47`	`{`
`48`		`- &extra::json::Object(copy interface) =>`
	`48`	`+ &extra::json::Object(ref interface) =>`
`49`	`49`	`{`
`50`		`- let name = lookup(copy interface, ~"ifDescr", ~"");`
	`50`	`+ let name = lookup(copy *interface, ~"ifDescr", ~"");`
`51`	`51`	`let label = fmt!("%s-%s", managed_ip, name);`
`52`	`52`
`53`	`53`	`(label, bool_value(false))`