---

yaml
---
r: 234056
b: refs/heads/beta
c: 99f3bfc
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 013c37a69247014702e7c3221dd4e890314d0a58
+refs/heads/beta: 99f3bfc20c737a2d602cf396829d78c797c0fe0d
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_mir/build/expr/category.rs

@@ -87,7 +87,9 @@ impl Category {
             ExprKind::Break { .. } |
             ExprKind::Continue { .. } |
             ExprKind::Return { .. } =>
-                Some(Category::Rvalue(RvalueFunc::Into)), // TODO
+                // FIXME(#27840) these probably want their own
+                // category, like "nonterminating"
+                Some(Category::Rvalue(RvalueFunc::Into)),
         }
     }
 }

branches/beta/src/librustc_mir/tcx/mod.rs

@@ -106,7 +106,7 @@ impl<'a,'tcx:'a> Hair for Cx<'a, 'tcx> {
 
     fn needs_drop(&mut self, ty: Ty<'tcx>, span: Self::Span) -> bool {
         if self.infcx.type_moves_by_default(ty, span) {
-            // TODO we should do an add'l check here to determine if
+            // FIXME(#21859) we should do an add'l check here to determine if
             // any dtor will execute, but the relevant fn
             // (`type_needs_drop`) is currently factored into
             // `librustc_trans`, so we can't easily do so.