Skip to content

Commit be2fba5

Browse files
committed
---
yaml --- r: 22059 b: refs/heads/snap-stage3 c: 8b13912 h: refs/heads/master i: 22057: 649656a 22055: 1af409c v: v3
1 parent c4dcaf2 commit be2fba5

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 264e1b2edbba5fcb4dc0866fa168f434fe54876b
4+
refs/heads/snap-stage3: 8b13912a839a5e0336fa285d9b62c1337e17b165
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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/snap-stage3/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)