---

yaml
---
r: 30100
b: refs/heads/incoming
c: 0cece20
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 7fb5f41bacade4999b84c61bbc5e392048fc8c42
+refs/heads/incoming: 0cece20ea5beb97ce31408a363c01cc34e62424b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/cargo/cargo.rs

@@ -193,7 +193,7 @@ fn is_archive_url(u: ~str) -> bool {
     // url parsing, we wouldn't need it
 
     match str::find_str(u, ~"://") {
-        option::some(i) => has_archive_extension(u),
+        option::some(_) => has_archive_extension(u),
         _ => false
     }
 }
@@ -251,7 +251,7 @@ fn load_crate(filename: &Path) -> option<crate> {
 
     for c.node.attrs.each |a| {
         match a.node.value.node {
-            ast::meta_name_value(v, {node: ast::lit_str(s), span: _}) => {
+            ast::meta_name_value(v, {node: ast::lit_str(_), span: _}) => {
                 match v {
                     ~"desc" => desc = some(v),
                     ~"sigs" => sigs = some(v),
@@ -281,7 +281,7 @@ fn load_crate(filename: &Path) -> option<crate> {
     fn goto_view_item(ps: syntax::parse::parse_sess, e: env,
                       i: @ast::view_item) {
         match i.node {
-            ast::view_item_use(ident, metas, id) => {
+            ast::view_item_use(ident, metas, _) => {
                 let name_items =
                     attr::find_meta_items_by_name(metas, ~"name");
                 let m = if name_items.is_empty() {
@@ -1646,21 +1646,18 @@ fn cmd_sources(c: cargo) {
                 return;
             }
 
-            match c.sources.find(name) {
-                some(source) => {
-                    error(fmt!("source already exists: %s", name));
-                }
-                none => {
-                    c.sources.insert(name, @{
-                        name: name,
-                        mut url: url,
-                        mut method: assume_source_method(url),
-                        mut key: none,
-                        mut keyfp: none,
-                        mut packages: ~[mut]
-                    });
-                    info(fmt!("added source: %s", name));
-                }
+            if c.sources.contains_key(name) {
+                error(fmt!("source already exists: %s", name));
+            } else {
+                c.sources.insert(name, @{
+                    name: name,
+                    mut url: url,
+                    mut method: assume_source_method(url),
+                    mut key: none,
+                    mut keyfp: none,
+                    mut packages: ~[mut]
+                });
+                info(fmt!("added source: %s", name));
             }
         }
         ~"remove" => {
@@ -1676,14 +1673,11 @@ fn cmd_sources(c: cargo) {
                 return;
             }
 
-            match c.sources.find(name) {
-                some(source) => {
-                    c.sources.remove(name);
-                    info(fmt!("removed source: %s", name));
-                }
-                none => {
-                    error(fmt!("no such source: %s", name));
-                }
+            if c.sources.contains_key(name) {
+                c.sources.remove(name);
+                info(fmt!("removed source: %s", name));
+            } else {
+                error(fmt!("no such source: %s", name));
             }
         }
         ~"set-url" => {

branches/incoming/src/rustdoc/markdown_pass.rs

@@ -204,7 +204,7 @@ fn header_kind(doc: doc::itemtag) -> ~str {
       doc::traittag(_) => {
         ~"Interface"
       }
-      doc::impltag(doc) => {
+      doc::impltag(_) => {
         ~"Implementation"
       }
       doc::tytag(_) => {