Skip to content

Commit 9bf36c0

Browse files
committed
---
yaml --- r: 42741 b: refs/heads/try c: 58ec84a h: refs/heads/master i: 42739: 7601ea1 v: v3
1 parent cba63d3 commit 9bf36c0

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
5-
refs/heads/try: 15871a7458feee550c9ba65db802ed0fb5db2ae7
5+
refs/heads/try: 58ec84a098376860c2126389938b340fbb810d78
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/test/compile-fail/lint-heap-memory.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010

1111
#[forbid(heap_memory)];
1212

13-
type Foo = { //~ ERROR type uses managed
14-
x: @int
15-
};
13+
struct Foo {
14+
x: @int //~ ERROR type uses managed
15+
}
16+
17+
struct Bar { x: ~int } //~ ERROR type uses owned
1618

1719
fn main() {
18-
let _x : { x : ~int } = {x : ~10};
20+
let _x : Bar = Bar {x : ~10};
1921
//~^ ERROR type uses owned
20-
//~^^ ERROR type uses owned
2122
}

branches/try/src/test/compile-fail/lint-managed-heap-memory.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
#[forbid(managed_heap_memory)];
1212

13-
type Foo = { //~ ERROR type uses managed
14-
x: @int
15-
};
13+
struct Foo {
14+
x: @int //~ ERROR type uses managed
15+
}
1616

1717
fn main() {
18-
let _x : Foo = {x : @10};
18+
let _x : Foo = Foo {x : @10};
1919
//~^ ERROR type uses managed
20-
//~^^ ERROR type uses managed
2120
}

branches/try/src/test/compile-fail/lint-owned-heap-memory.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010

1111
#[forbid(owned_heap_memory)];
1212

13-
type Foo = { //~ ERROR type uses owned
14-
x: ~int
15-
};
13+
struct Foo {
14+
x: ~int //~ ERROR type uses owned
15+
}
1616

1717
fn main() {
18-
let _x : Foo = {x : ~10};
18+
let _x : Foo = Foo {x : ~10};
1919
//~^ ERROR type uses owned
20-
//~^^ ERROR type uses owned
2120
}

0 commit comments

Comments
 (0)