Skip to content

Commit

Permalink
Rollup merge of rust-lang#44326 - Eh2406:FIXME#44590, r=arielb1
Browse files Browse the repository at this point in the history
rust-lang#33490 is closed remove the FIXME

let's see if this can be cleaned up.

rust-lang#33490 (comment)
  • Loading branch information
Mark-Simulacrum committed Sep 6, 2017
2 parents 68e8c40 + e90f423 commit 78986dc
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/test/run-pass/issue-23338-ensure-param-drop-order.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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
Expand Down

0 comments on commit 78986dc

Please sign in to comment.