Skip to content

Commit eadba53

Browse files
committed
---
yaml --- r: 42915 b: refs/heads/try c: 0a75aef h: refs/heads/master i: 42913: 259a772 42911: 077e450 v: v3
1 parent 3b4cf7a commit eadba53

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
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: 2846e033d7eb961a5043a8cf5b8c6f516ba97b90
5+
refs/heads/try: 0a75aefad0e43e129fcba5e6c38fc9bbc620b952
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/test/compile-fail/map-types.rs

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

11-
extern mod std;
12-
use std::map;
13-
use std::map::HashMap;
14-
use std::map::StdMap;
11+
use core::container::Map;
12+
use core::hashmap::linear::LinearMap;
1513

1614
// Test that trait types printed in error msgs include the type arguments.
1715

1816
fn main() {
19-
let x: StdMap<~str,~str> = map::HashMap::<~str,~str>() as
20-
StdMap::<~str,~str>;
21-
let y: StdMap<uint,~str> = x;
22-
//~^ ERROR mismatched types: expected `@std::map::StdMap<uint,~str>`
17+
let x: Map<~str, ~str> = LinearMap::new::<~str, ~str>() as
18+
Map::<~str, ~str>;
19+
let y: Map<uint, ~str> = x;
20+
//~^ ERROR mismatched types: expected `@core::container::Map/&<uint,~str>`
2321
}

0 commit comments

Comments
 (0)