Skip to content

Commit e4e3550

Browse files
Sawyer47alexcrichton
authored andcommitted
Remove few FIXMEs
This commit removes FIXMEs of few closed issues. Closes #13992
1 parent 5807800 commit e4e3550

File tree

5 files changed

+7
-19
lines changed

5 files changed

+7
-19
lines changed

src/test/compile-fail/issue-9725.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-test FIXME: #13992
12-
1311
struct A { foo: int }
1412

1513
fn main() {
16-
let A { foo, foo } = A { foo: 3 }; //~ ERROR: field `foo` bound twice
14+
let A { foo, foo } = A { foo: 3 };
15+
//~^ ERROR: identifier `foo` is bound more than once in the same pattern
1716
}

src/test/compile-fail/regionck-closure-lifetimes.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,19 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
fn env<'a>(_: &'a uint, blk: |p: ||: 'a|) {
11+
fn env<'a>(blk: |p: ||: 'a|) {
1212
// Test that the closure here cannot be assigned
1313
// the lifetime `'a`, which outlives the current
1414
// block.
15-
//
16-
// FIXME(#4846): The `&'a uint` parameter is needed to ensure that `'a`
17-
// is a free and not bound region name.
1815

1916
let mut state = 0;
2017
let statep = &mut state;
2118
blk(|| *statep = 1); //~ ERROR cannot infer
2219
}
2320

24-
fn no_env_no_for<'a>(_: &'a uint, blk: |p: |||: 'a) {
21+
fn no_env_no_for<'a>(blk: |p: |||: 'a) {
2522
// Test that a closure with no free variables CAN
2623
// outlive the block in which it is created.
27-
//
28-
// FIXME(#4846): The `&'a uint` parameter is needed to ensure that `'a`
29-
// is a free and not bound region name.
3024

3125
blk(|| ())
3226
}

src/test/run-pass/item-attributes.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,17 @@ mod test_stmt_multi_attr_outer {
9595
#[attr2 = "val"]
9696
fn f() { }
9797

98-
/* FIXME: Issue #493
9998
#[attr1 = "val"]
10099
#[attr2 = "val"]
101100
mod mod1 {
102101
}
103102

104-
pub mod rustrt {
103+
mod rustrt {
105104
#[attr1 = "val"]
106105
#[attr2 = "val"]
107106
extern {
108107
}
109108
}
110-
*/
111109
}
112110
}
113111

src/test/run-pass/reexport-star.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
#![feature(globs)]
1313

14-
// FIXME #3654
15-
1614
mod a {
1715
pub fn f() {}
1816
pub fn g() {}

src/test/run-pass/trait-generic.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ trait map<T> {
2929
impl<T> map<T> for Vec<T> {
3030
fn map<U>(&self, f: |&T| -> U) -> Vec<U> {
3131
let mut r = Vec::new();
32-
// FIXME: #7355 generates bad code with VecIterator
33-
for i in range(0u, self.len()) {
34-
r.push(f(self.get(i)));
32+
for i in self.iter() {
33+
r.push(f(i));
3534
}
3635
r
3736
}

0 commit comments

Comments
 (0)