about summary refs log tree commit diff
path: root/src/librustc/mir
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2018-11-26 09:35:23 +0100
committerOliver Scherer <github35764891676564198441@oli-obk.de>2018-11-30 09:44:06 +0100
commit507ea97a3e245887bc8cbea0f0fe8474d082bd0e (patch)
tree8fb422826a94fcc30b50235044b1c5c5326590c2 /src/librustc/mir
parentd62bcad38da1b65ecd8a3544c3ff94855b88366a (diff)
downloadrust-507ea97a3e245887bc8cbea0f0fe8474d082bd0e.tar.gz
rust-507ea97a3e245887bc8cbea0f0fe8474d082bd0e.zip
Properly name the flag for `&&` -> `&` conversion
Diffstat (limited to 'src/librustc/mir')
-rw-r--r--src/librustc/mir/mod.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index a82a7b555a0..3968d9aece2 100644
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -153,7 +153,7 @@ pub struct Mir<'tcx> {
     /// `||` expression into `&` or `|` respectively. This is problematic because if we ever stop
     /// this conversion from happening and use short circuiting, we will cause the following code
     /// to change the value of `x`: `let mut x = 42; false && { x = 55; true };`
-    pub const_can_have_let_mut_bindings: bool,
+    pub control_flow_destroyed: bool,
 
     /// A span representing this MIR, for error reporting
     pub span: Span,
@@ -173,7 +173,7 @@ impl<'tcx> Mir<'tcx> {
         arg_count: usize,
         upvar_decls: Vec<UpvarDecl>,
         span: Span,
-        const_can_have_let_mut_bindings: bool,
+        control_flow_destroyed: bool,
     ) -> Self {
         // We need `arg_count` locals, and one for the return place
         assert!(
@@ -198,7 +198,7 @@ impl<'tcx> Mir<'tcx> {
             spread_arg: None,
             span,
             cache: cache::Cache::new(),
-            const_can_have_let_mut_bindings,
+            control_flow_destroyed,
         }
     }
 
@@ -429,7 +429,7 @@ impl_stable_hash_for!(struct Mir<'tcx> {
     arg_count,
     upvar_decls,
     spread_arg,
-    const_can_have_let_mut_bindings,
+    control_flow_destroyed,
     span,
     cache
 });
@@ -2983,7 +2983,7 @@ BraceStructTypeFoldableImpl! {
         arg_count,
         upvar_decls,
         spread_arg,
-        const_can_have_let_mut_bindings,
+        control_flow_destroyed,
         span,
         cache,
     }