---

yaml
---
r: 117629
b: refs/heads/auto
c: cc28ae5
h: refs/heads/master
i:
  117627: 292ef3e
v: v3

Author: hannobraun

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: ddd09df1377456de0f8376414d27828ba104df5b
+refs/heads/auto: cc28ae5201b0927683b253dbe893a62a188aa5a5
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustdoc/html/static/playpen.js

@@ -22,7 +22,7 @@
             a.attr('target', '_blank');
             $(this).append(a);
         }, function() {
-            $(this).find('a.test-arrow').remove();
+            $(this).find('a').remove();
         });
     }
 }());

branches/auto/src/libsyntax/ext/quote.rs

@@ -135,6 +135,12 @@ pub mod rt {
         }
     }
 
+    impl ToSource for ast::Arg {
+        fn to_source(&self) -> String {
+            pprust::arg_to_str(self)
+        }
+    }
+
     impl<'a> ToSource for &'a str {
         fn to_source(&self) -> String {
             let lit = dummy_spanned(ast::LitStr(
@@ -264,6 +270,7 @@ pub mod rt {
     impl_to_tokens!(Generics)
     impl_to_tokens!(@ast::Expr)
     impl_to_tokens!(ast::Block)
+    impl_to_tokens!(ast::Arg)
     impl_to_tokens_self!(&'a str)
     impl_to_tokens!(())
     impl_to_tokens!(char)

branches/auto/src/libsyntax/print/pprust.rs

@@ -242,6 +242,10 @@ pub fn variant_to_str(var: &ast::Variant) -> String {
     to_str(|s| s.print_variant(var))
 }
 
+pub fn arg_to_str(arg: &ast::Arg) -> String {
+    to_str(|s| s.print_arg(arg))
+}
+
 pub fn visibility_qualified(vis: ast::Visibility, s: &str) -> String {
     match vis {
         ast::Public => format!("pub {}", s).to_string(),

branches/auto/src/test/compile-fail/borrowck-field-sensitivity.rs

@@ -10,13 +10,15 @@
 
 struct A { a: int, b: Box<int> }
 
-fn deref_after_move() {
+fn borrow<T>(_: &T) { }
+
+fn use_after_move() {
     let x = A { a: 1, b: box 2 };
     drop(x.b);
     drop(*x.b); //~ ERROR use of partially moved value: `*x.b`
 }
 
-fn deref_after_fu_move() {
+fn use_after_fu_move() {
     let x = A { a: 1, b: box 2 };
     let y = A { a: 3, .. x };
     drop(*x.b); //~ ERROR use of partially moved value: `*x.b`
@@ -25,37 +27,35 @@ fn deref_after_fu_move() {
 fn borrow_after_move() {
     let x = A { a: 1, b: box 2 };
     drop(x.b);
-    let p = &x.b; //~ ERROR use of moved value: `x.b`
-    drop(**p);
+    borrow(&x.b); //~ ERROR use of moved value: `x.b`
 }
 
 fn borrow_after_fu_move() {
     let x = A { a: 1, b: box 2 };
     let _y = A { a: 3, .. x };
-    let p = &x.b; //~ ERROR use of moved value: `x.b`
-    drop(**p);
+    borrow(&x.b); //~ ERROR use of moved value: `x.b`
 }
 
 fn move_after_borrow() {
     let x = A { a: 1, b: box 2 };
-    let p = &x.b;
+    let y = &x.b;
     drop(x.b); //~ ERROR cannot move out of `x.b` because it is borrowed
-    drop(**p);
+    borrow(&*y);
 }
 
 fn fu_move_after_borrow() {
     let x = A { a: 1, b: box 2 };
-    let p = &x.b;
-    let _y = A { a: 3, .. x }; //~ ERROR cannot move out of `x.b` because it is borrowed
-    drop(**p);
+    let y = &x.b;
+    let _z = A { a: 3, .. x }; //~ ERROR cannot move out of `x.b` because it is borrowed
+    borrow(&*y);
 }
 
 fn mut_borrow_after_mut_borrow() {
     let mut x = A { a: 1, b: box 2 };
-    let p = &mut x.a;
-    let q = &mut x.a; //~ ERROR cannot borrow `x.a` as mutable more than once at a time
-    drop(*p);
-    drop(*q);
+    let y = &mut x.a;
+    let z = &mut x.a; //~ ERROR cannot borrow `x.a` as mutable more than once at a time
+    drop(*y);
+    drop(*z);
 }
 
 fn move_after_move() {
@@ -84,21 +84,7 @@ fn fu_move_after_fu_move() {
 
 // The following functions aren't yet accepted, but they should be.
 
-fn move_after_borrow_correct() {
-    let x = A { a: 1, b: box 2 };
-    let p = &x.a;
-    drop(x.b); //~ ERROR cannot move out of `x.b` because it is borrowed
-    drop(*p);
-}
-
-fn fu_move_after_borrow_correct() {
-    let x = A { a: 1, b: box 2 };
-    let p = &x.a;
-    let _y = A { a: 3, .. x }; //~ ERROR cannot move out of `x.b` because it is borrowed
-    drop(*p);
-}
-
-fn copy_after_field_assign_after_uninit() {
+fn use_after_field_assign_after_uninit() {
     let mut x: A;
     x.a = 1;
     drop(x.a); //~ ERROR use of possibly uninitialized variable: `x.a`
@@ -107,8 +93,7 @@ fn copy_after_field_assign_after_uninit() {
 fn borrow_after_field_assign_after_uninit() {
     let mut x: A;
     x.a = 1;
-    let p = &x.a; //~ ERROR use of possibly uninitialized variable: `x.a`
-    drop(*p);
+    borrow(&x.a); //~ ERROR use of possibly uninitialized variable: `x.a`
 }
 
 fn move_after_field_assign_after_uninit() {
@@ -118,8 +103,8 @@ fn move_after_field_assign_after_uninit() {
 }
 
 fn main() {
-    deref_after_move();
-    deref_after_fu_move();
+    use_after_move();
+    use_after_fu_move();
 
     borrow_after_move();
     borrow_after_fu_move();
@@ -132,10 +117,7 @@ fn main() {
     fu_move_after_move();
     fu_move_after_fu_move();
 
-    move_after_borrow_correct();
-    fu_move_after_borrow_correct();
-
-    copy_after_field_assign_after_uninit();
+    use_after_field_assign_after_uninit();
     borrow_after_field_assign_after_uninit();
     move_after_field_assign_after_uninit();
 }