Skip to content

Commit 7df7a9d

Browse files
committed
Start porting tests to use classes with dtors instead of resources
1 parent 8448711 commit 7df7a9d

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

src/test/run-pass/conditional-compile.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@ enum tg { foo, }
2525
enum tg { bar, }
2626

2727
#[cfg(bogus)]
28-
resource r(i: int) { }
28+
class r {
29+
new(i:int) {}
30+
}
2931

30-
resource r(i: int) { }
32+
class r {
33+
new(i:int) {}
34+
}
3135

3236
#[cfg(bogus)]
3337
mod m {

src/test/run-pass/init-res-into-things.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
// Resources can't be copied, but storing into data structures counts
22
// as a move unless the stored thing is used afterwards.
33

4-
resource r(i: @mut int) {
5-
*i = *i + 1;
4+
class r {
5+
let i: @mut int;
6+
new(i: @mut int) {
7+
self.i = i;
8+
}
9+
drop { *(self.i) = *(self.i) + 1; }
610
}
711

812
fn test_box() {

src/test/run-pass/issue-979.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
resource r(b: @mut int) {
2-
*b += 1;
1+
class r {
2+
let b: @mut int;
3+
new(b: @mut int) {
4+
self.b = b;
5+
}
6+
drop { *(self.b) += 1; }
37
}
48

59
fn main() {

src/test/run-pass/resource-assign-is-not-copy.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
resource r(i: @mut int) { *i += 1; }
1+
class r {
2+
let i: @mut int;
3+
new(i: @mut int) {
4+
self.i = i;
5+
}
6+
drop { *(self.i) += 1; }
7+
}
28

39
fn main() {
410
let i = @mut 0;

0 commit comments

Comments
 (0)