---

yaml
---
r: 227915
b: refs/heads/try
c: b1931e4
h: refs/heads/master
i:
  227913: 5858c82
  227911: 1468e4b
v: v3

Author: huonw

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 9a26e49459b4069650dd23e5ba35acd5eb868f2e
+refs/heads/try: b1931e48a01b418b4b1ba6c747f2c99a5b10d96f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/doc/guide-pointers.md

@@ -1,7 +1,4 @@
-% The Rust Pointer Guide
+% The (old) Rust Pointer Guide
 
-This content has been removed, with no direct replacement. Rust only
-has two built-in pointer types now,
-[references](book/references-and-borrowing.html) and [raw
-pointers](book/raw-pointers.html). Older Rusts had many more pointer
-types, they’re gone now.
+This content has moved into
+[the Rust Programming Language book](book/pointers.html).

branches/try/src/librustc_lint/builtin.rs

@@ -1973,8 +1973,13 @@ impl LintPass for UnconditionalRecursion {
                                       fn_id: ast::NodeId,
                                       _: ast::Ident,
                                       id: ast::NodeId) -> bool {
-            tcx.def_map.borrow().get(&id)
-               .map_or(false, |def| def.def_id() == local_def(fn_id))
+            match tcx.map.get(id) {
+                ast_map::NodeExpr(&ast::Expr { node: ast::ExprCall(ref callee, _), .. }) => {
+                    tcx.def_map.borrow().get(&callee.id)
+                        .map_or(false, |def| def.def_id() == local_def(fn_id))
+                }
+                _ => false
+            }
         }
 
         // check if the method call `id` refers to method `method_id`

branches/try/src/test/compile-fail/lint-unconditional-recursion.rs

@@ -63,4 +63,8 @@ impl Baz {
     }
 }
 
+fn all_fine() {
+    let _f = all_fine;
+}
+
 fn main() {}