about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-09-06 18:27:58 -0600
committerGitHub <noreply@github.com>2017-09-06 18:27:58 -0600
commit43d20c7abd8356def333cfef3d5b79e3ef505fec (patch)
tree287cd2a68aed326e2de59b366b730844801e57cf
parenta4b54848d4a4ca720de0c8d86a90731c76bf491d (diff)
parente90f4236e0b06b52c0023ea46049736e45438ebf (diff)
downloadrust-43d20c7abd8356def333cfef3d5b79e3ef505fec.tar.gz
rust-43d20c7abd8356def333cfef3d5b79e3ef505fec.zip
Rollup merge of #44326 - Eh2406:FIXME#44590, r=arielb1
#33490 is closed remove the FIXME

let's see if this can be cleaned up.

https://github.com/rust-lang/rust/issues/33490#issuecomment-326851930
-rw-r--r--src/test/run-pass/issue-23338-ensure-param-drop-order.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/run-pass/issue-23338-ensure-param-drop-order.rs b/src/test/run-pass/issue-23338-ensure-param-drop-order.rs
index 9d0612f2a8d..42c72e647fd 100644
--- a/src/test/run-pass/issue-23338-ensure-param-drop-order.rs
+++ b/src/test/run-pass/issue-23338-ensure-param-drop-order.rs
@@ -64,8 +64,7 @@ fn test<'a>(log: d::Log<'a>) {
     d::println(&format!("result {}", result));
 }
 
-// FIXME(#33490) Remove the double braces when old trans is gone.
-fn foo<'a>(da0: D<'a>, de1: D<'a>) -> D<'a> {{
+fn foo<'a>(da0: D<'a>, de1: D<'a>) -> D<'a> {
     d::println("entered foo");
     let de2 = de1.incr();      // creates D(de_2, 2)
     let de4 = {
@@ -74,7 +73,7 @@ fn foo<'a>(da0: D<'a>, de1: D<'a>) -> D<'a> {{
     };
     d::println("eval tail of foo");
     de4.incr().incr()          // creates D(de_5, 6) and D(de_6, 7)
-}}
+}
 
 // This module provides simultaneous printouts of the dynamic extents
 // of all of the D values, in addition to logging the order that each