---

yaml
---
r: 180991
b: refs/heads/master
c: d0ef166
h: refs/heads/master
i:
  180989: 02ef361
  180987: b3b571d
  180983: d91c181
  180975: 5f744e9
  180959: 190e3fc
  180927: c220da6
  180863: c07fab6
  180735: 72f567a
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f58a1bfa981eee4ba4d4c3c801f94772e4ab0019
+refs/heads/master: d0ef1664ca9bc885724e3a42d3194079ad0cf582
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f1bb6c2f46f08c1d7b6d695f5b3cf93142cb8860
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/librustc_typeck/check/mod.rs

@@ -1891,12 +1891,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
 impl<'a, 'tcx> RegionScope for FnCtxt<'a, 'tcx> {
     fn object_lifetime_default(&self, span: Span) -> Option<ty::Region> {
-        // TODO. RFC #599 specifies that object lifetime defaults take
-        // precedence over other defaults. *However,* within a fn
-        // body, we typically use inference to allow users to elide
-        // lifetimes whenever they like, and then just infer it to
-        // whatever it must be. So I interpret that as applying only
-        // to fn sigs.
+        // RFC #599 specifies that object lifetime defaults take
+        // precedence over other defaults. But within a fn body we
+        // don't have a *default* region, rather we use inference to
+        // find the *correct* region, which is strictly more general
+        // (and anyway, within a fn body the right region may not even
+        // be something the user can write explicitly, since it might
+        // be some expression).
         Some(self.infcx().next_region_var(infer::MiscVariable(span)))
     }