about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-16 15:06:48 +0000
committerbors <bors@rust-lang.org>2014-06-16 15:06:48 +0000
commit0b32d42a5da84c1f23a2b50b9a6741eea69773c4 (patch)
tree1b694bb47ace03ffa77f5f0dce8c69eda3d2b247
parent8a5c5b6081ee041145024176c668cb19e39a01d4 (diff)
parent1a852a6df77d6676e3f88f166a277888742acdbc (diff)
downloadrust-0b32d42a5da84c1f23a2b50b9a6741eea69773c4.tar.gz
rust-0b32d42a5da84c1f23a2b50b9a6741eea69773c4.zip
auto merge of #14882 : pcwalton/rust/drop-underscore, r=nikomatsakis
This code didn't do anything, but was a vestige of the old semantics for
`let _ = ...`.

Closes #10488. (As near as I can tell anyhow.)

r? @nikomatsakis 
-rw-r--r--src/librustc/middle/trans/base.rs16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs
index 4657c8cd136..998e8500b99 100644
--- a/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@ -972,23 +972,9 @@ pub fn ignore_lhs(_bcx: &Block, local: &ast::Local) -> bool {
 
 pub fn init_local<'a>(bcx: &'a Block<'a>, local: &ast::Local)
                   -> &'a Block<'a> {
-
-    debug!("init_local(bcx={}, local.id={:?})",
-           bcx.to_str(), local.id);
+    debug!("init_local(bcx={}, local.id={:?})", bcx.to_str(), local.id);
     let _indenter = indenter();
-
     let _icx = push_ctxt("init_local");
-
-    if ignore_lhs(bcx, local) {
-        // Handle let _ = e; just like e;
-        match local.init {
-            Some(ref init) => {
-                return controlflow::trans_stmt_semi(bcx, &**init)
-            }
-            None => { return bcx; }
-        }
-    }
-
     _match::store_local(bcx, local)
 }