---

yaml
---
r: 161022
b: refs/heads/try
c: 330a1af
h: refs/heads/master
v: v3

Author: Jakub Bukaj

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 4eb72d268f337a8f117c86a2ac1b98336cab9e9d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c9f6d696420107f82304b992cf623b806995fe18
-refs/heads/try: 9673365b3712102c025db451b497500ae82d5f3a
+refs/heads/try: 330a1afae84c7bea583907e5b1f02448a4c7bc20
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libcore/borrow.rs

@@ -47,6 +47,7 @@
 use clone::Clone;
 use kinds::Sized;
 use ops::Deref;
+use self::Cow::*;
 
 /// A trait for borrowing data.
 pub trait BorrowFrom<Sized? Owned> for Sized? {

branches/try/src/libgraphviz/lib.rs

@@ -836,7 +836,7 @@ r#"digraph syntax_tree {
 
     #[test]
     fn simple_id_construction() {
-        let id1 = dot::Id::new("hello");
+        let id1 = Id::new("hello");
         match id1 {
             Ok(_) => {;},
             Err(_) => panic!("'hello' is not a valid value for id anymore")
@@ -845,7 +845,7 @@ r#"digraph syntax_tree {
 
     #[test]
     fn badly_formatted_id() {
-        let id2 = dot::Id::new("Weird { struct : ure } !!!");
+        let id2 = Id::new("Weird { struct : ure } !!!");
         match id2 {
             Ok(_) => panic!("graphviz id suddenly allows spaces, brackets and stuff"),
             Err(_) => {;}

branches/try/src/librustc/middle/stability.rs

@@ -79,8 +79,8 @@ impl<'v> Visitor<'v> for Annotator {
         }
     }
 
-    fn visit_fn(&mut self, fk: FnKind<'v>, fd: &'v FnDecl,
-                b: &'v Block, s: Span, _: NodeId) {
+    fn visit_fn(&mut self, fk: FnKind<'v>, _: &'v FnDecl,
+                _: &'v Block, _: Span, _: NodeId) {
         match fk {
             FkMethod(_, _, meth) => {
                 // Methods are not already annotated, so we annotate it