---

yaml
---
r: 31654
b: refs/heads/dist-snap
c: dbf5871
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: a52f6d26db810b947f5ff515ffae18a31e9479c0
+refs/heads/dist-snap: dbf58716dfe1dd502ea37d5a613847406a9736c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libstd/net_url.rs

@@ -353,7 +353,7 @@ fn get_scheme(rawurl: ~str) -> result::result<(~str, ~str), @~str> {
           }
         }
     };
-    return result::ok((copy rawurl, ~""));
+    return result::err(@~"url: Scheme must be terminated with a colon.");
 }
 
 // returns userinfo, host, port, and unparsed part, or an error
@@ -779,6 +779,11 @@ mod tests {
         assert option::unwrap(copy u.fragment) == ~"something";
     }
 
+    #[test]
+    fn test_no_scheme() {
+        assert result::is_err(get_scheme(~"noschemehere.html"));
+    }
+
     #[test]
     fn test_invalid_scheme_errors() {
         assert result::is_err(from_str(~"99://something"));