Skip to content

Commit cede17b

Browse files
committed
---
yaml --- r: 42943 b: refs/heads/try c: 04eb9b4 h: refs/heads/master i: 42941: ab71937 42939: 9495aae 42935: dbf7656 42927: 908b65a 42911: 077e450 42879: 7970bfd v: v3
1 parent 2374b59 commit cede17b

File tree

7 files changed

+48
-4
lines changed

7 files changed

+48
-4
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: 5d03612f9d643b6a49678535972715456dd6ac19
5+
refs/heads/try: 04eb9b4eb0472aa89dce1ad53d33f5e52284b128
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/metadata/encoder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,8 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Encoder,
547547
let tcx = ecx.tcx;
548548
let must_write =
549549
match item.node {
550-
item_enum(_, _) | item_impl(*)
551-
| item_trait(*) | item_struct(*) => true,
550+
item_enum(_, _) | item_impl(*) | item_trait(*) | item_struct(*) |
551+
item_mod(*) | item_foreign_mod(*) => true,
552552
_ => false
553553
};
554554
if !must_write && !reachable(ecx, item.id) { return; }

branches/try/src/librustc/middle/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ pub impl Resolver {
12121212
let parent_link = self.get_parent_link(new_parent,
12131213
ident);
12141214
let def_id = local_def(item.id);
1215-
name_bindings.define_module(privacy,
1215+
name_bindings.define_module(Public,
12161216
parent_link,
12171217
Some(def_id),
12181218
TraitModuleKind,
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#[crate_type = "lib"];
2+
3+
pub struct Fish {
4+
x: int
5+
}
6+
7+
impl Fish {
8+
fn swim(&self) {}
9+
}
10+
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#[crate_type = "lib"];
2+
3+
pub struct Fish {
4+
x: int
5+
}
6+
7+
mod unexported {
8+
use super::Fish;
9+
impl Fish : Eq {
10+
pure fn eq(&self, _: &Fish) -> bool { true }
11+
pure fn ne(&self, _: &Fish) -> bool { false }
12+
}
13+
}
14+
15+
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// aux-build:impl_privacy_xc_1.rs
2+
3+
extern mod impl_privacy_xc_1;
4+
5+
fn main() {
6+
let fish = impl_privacy_xc_1::Fish { x: 1 };
7+
fish.swim();
8+
}
9+
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// aux-build:impl_privacy_xc_2.rs
2+
3+
extern mod impl_privacy_xc_2;
4+
5+
fn main() {
6+
let fish1 = impl_privacy_xc_2::Fish { x: 1 };
7+
let fish2 = impl_privacy_xc_2::Fish { x: 2 };
8+
io::println(if fish1.eq(&fish2) { "yes" } else { "no " });
9+
}
10+

0 commit comments

Comments
 (0)