---

nikomatsakis · nikomatsakis · commit 14f9ad6e36c0 · 2016-03-23T16:42:54.000-04:00
yaml --- r: 273529 b: refs/heads/beta c: b3d2059 h: refs/heads/master i: 273527: ddec763
diff --git a/[refs] b/[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: c1a53a60e775b3eefd315ed240db6a7589266920
+refs/heads/beta: b3d2059b08b33edaa82e200bb433b0324f4bc5e5
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/librustc_mir/build/scope.rs b/branches/beta/src/librustc_mir/build/scope.rs
@@ -282,7 +282,7 @@ impl<'a,'tcx> Builder<'a,'tcx> {
         self.scope_auxiliary[scope.id.index()]
             .postdoms
             .push(self.cfg.current_location(block));
-        block.and(())
+        block.unit()
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ impl<'a,'tcx> Builder<'a,'tcx> {`
`282`	`282`	`self.scope_auxiliary[scope.id.index()]`
`283`	`283`	`.postdoms`
`284`	`284`	`.push(self.cfg.current_location(block));`
`285`		`- block.and(())`
	`285`	`+ block.unit()`
`286`	`286`	`}`
`287`	`287`
`288`	`288`