Skip to content

Commit 70d727c

Browse files
committed
---
yaml --- r: 39626 b: refs/heads/incoming c: 40eaecb h: refs/heads/master v: v3
1 parent ab05b8f commit 70d727c

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: c42d5e274766d56cb0ca6c94b45ea05e5292f606
9+
refs/heads/incoming: 40eaecbd47ad2eec3be1787cccf9222957946d00
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/auxiliary/cci_class_cast.rs

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

11-
#[legacy_exports];
11+
use core::to_str::*;
1212

13-
use to_str::*;
14-
use to_str::ToStr;
15-
16-
mod kitty {
13+
pub mod kitty {
1714
pub struct cat {
1815
priv mut meows : uint,
1916
mut how_hungry : int,

branches/incoming/src/test/run-pass/export-non-interference3.rs

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

11-
mod foo {
12-
pub fn x() { bar::x(); }
11+
pub mod foo {
12+
pub fn x() { ::bar::x(); }
1313
}
1414

15-
mod bar {
15+
pub mod bar {
1616
pub fn x() { debug!("x"); }
1717
}
1818

0 commit comments

Comments
 (0)