---

yaml
---
r: 28260
b: refs/heads/try
c: 07ee299
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: c2f8cf9dc18f30456178ae529afca1c962257dc0
+refs/heads/try: 07ee2997e6d003d64fe12373faab1e8e9483b0ed
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libstd/net_url.rs

@@ -42,7 +42,7 @@ fn userinfo(-user: ~str, -pass: Option<~str>) -> UserInfo {
     {user: user, pass: pass}
 }
 
-fn encode_inner(s: ~str, full_url: bool) -> ~str {
+fn encode_inner(s: &str, full_url: bool) -> ~str {
     do io::with_str_reader(s) |rdr| {
         let mut out = ~"";
 
@@ -87,7 +87,7 @@ fn encode_inner(s: ~str, full_url: bool) -> ~str {
  *
  * This function is compliant with RFC 3986.
  */
-fn encode(s: ~str) -> ~str {
+fn encode(s: &str) -> ~str {
     encode_inner(s, true)
 }
 
@@ -97,7 +97,7 @@ fn encode(s: ~str) -> ~str {
  *
  * This function is compliant with RFC 3986.
  */
-fn encode_component(s: ~str) -> ~str {
+fn encode_component(s: &str) -> ~str {
     encode_inner(s, false)
 }
 
@@ -917,30 +917,30 @@ mod tests {
 
     #[test]
     fn test_encode() {
-        assert encode(~"") == ~"";
-        assert encode(~"http://example.com") == ~"http://example.com";
-        assert encode(~"foo bar% baz") == ~"foo%20bar%25%20baz";
-        assert encode(~" ") == ~"%20";
-        assert encode(~"!") == ~"!";
-        assert encode(~"\"") == ~"\"";
-        assert encode(~"#") == ~"#";
-        assert encode(~"$") == ~"$";
-        assert encode(~"%") == ~"%25";
-        assert encode(~"&") == ~"&";
-        assert encode(~"'") == ~"%27";
-        assert encode(~"(") == ~"(";
-        assert encode(~")") == ~")";
-        assert encode(~"*") == ~"*";
-        assert encode(~"+") == ~"+";
-        assert encode(~",") == ~",";
-        assert encode(~"/") == ~"/";
-        assert encode(~":") == ~":";
-        assert encode(~";") == ~";";
-        assert encode(~"=") == ~"=";
-        assert encode(~"?") == ~"?";
-        assert encode(~"@") == ~"@";
-        assert encode(~"[") == ~"[";
-        assert encode(~"]") == ~"]";
+        assert encode("") == ~"";
+        assert encode("http://example.com") == ~"http://example.com";
+        assert encode("foo bar% baz") == ~"foo%20bar%25%20baz";
+        assert encode(" ") == ~"%20";
+        assert encode("!") == ~"!";
+        assert encode("\"") == ~"\"";
+        assert encode("#") == ~"#";
+        assert encode("$") == ~"$";
+        assert encode("%") == ~"%25";
+        assert encode("&") == ~"&";
+        assert encode("'") == ~"%27";
+        assert encode("(") == ~"(";
+        assert encode(")") == ~")";
+        assert encode("*") == ~"*";
+        assert encode("+") == ~"+";
+        assert encode(",") == ~",";
+        assert encode("/") == ~"/";
+        assert encode(":") == ~":";
+        assert encode(";") == ~";";
+        assert encode("=") == ~"=";
+        assert encode("?") == ~"?";
+        assert encode("@") == ~"@";
+        assert encode("[") == ~"[";
+        assert encode("]") == ~"]";
     }
 
     #[test]