Skip to content

Commit 5e9c872

Browse files
committed
---
yaml --- r: 30767 b: refs/heads/incoming c: 8b13912 h: refs/heads/master i: 30765: f202bff 30763: 6d80eb2 30759: 97449ad 30751: c7a8bd1 v: v3
1 parent b410ba9 commit 5e9c872

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 264e1b2edbba5fcb4dc0866fa168f434fe54876b
9+
refs/heads/incoming: 8b13912a839a5e0336fa285d9b62c1337e17b165
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/at_vec.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ pub pure fn from_elem<T: Copy>(n_elts: uint, +t: T) -> @[T] {
134134
}
135135

136136
#[cfg(notest)]
137-
mod traits {
137+
pub mod traits {
138138
#[legacy_exports];
139-
impl<T: Copy> @[T] : Add<&[const T],@[T]> {
139+
pub impl<T: Copy> @[T] : Add<&[const T],@[T]> {
140140
#[inline(always)]
141141
pure fn add(rhs: & &[const T]) -> @[T] {
142142
append(self, (*rhs))
@@ -249,9 +249,7 @@ pub fn test() {
249249
assert from_elem(5, 3.14) == @[3.14, 3.14, 3.14, 3.14, 3.14];
250250
}
251251

252-
/*
253252
#[test]
254253
pub fn append_test() {
255254
assert @[1,2,3] + @[4,5,6] == @[1,2,3,4,5,6];
256255
}
257-
*/

branches/incoming/src/rustc/middle/typeck/coherence.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,10 @@ impl CoherenceChecker {
654654
module_def_id,
655655
None);
656656
for (*implementations).each |implementation| {
657+
debug!("coherence: adding impl from external crate: %s",
658+
ty::item_path_str(self.crate_context.tcx,
659+
implementation.did));
660+
657661
// Make sure we don't visit the same implementation
658662
// multiple times.
659663
match impls_seen.find(implementation.did) {

0 commit comments

Comments
 (0)