Skip to content

Commit 594da74

Browse files
committed
---
yaml --- r: 227019 b: refs/heads/master c: d81feb8 h: refs/heads/master i: 227017: f29a950 227015: 74973b3 v: v3
1 parent 4711791 commit 594da74

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: f357d559ca0835ba2fcad11eb30a8ce821b6df58
2+
refs/heads/master: d81feb85f7b575b04a7249ccbf3a6b3fcc8c0e9d
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
44
refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc/middle/ty.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5683,13 +5683,9 @@ impl<'tcx> ctxt<'tcx> {
56835683
&format!("a default was defined here..."));
56845684
}
56855685
(_, _) => {
5686-
let elems = csearch::get_item_path(self, expected.def_id)
5687-
.into_iter()
5688-
.map(|p| p.to_string())
5689-
.collect::<Vec<_>>();
56905686
self.sess.note(
56915687
&format!("a default is defined on `{}`",
5692-
elems.join("::")));
5688+
self.item_path_str(expected.def_id)));
56935689
}
56945690
}
56955691

@@ -5704,13 +5700,9 @@ impl<'tcx> ctxt<'tcx> {
57045700
&format!("a second default was defined here..."));
57055701
}
57065702
(_, _) => {
5707-
let elems = csearch::get_item_path(self, found.def_id)
5708-
.into_iter()
5709-
.map(|p| p.to_string())
5710-
.collect::<Vec<_>>();
5711-
57125703
self.sess.note(
5713-
&format!("a second default is defined on `{}`", elems.join(" ")));
5704+
&format!("a second default is defined on `{}`",
5705+
self.item_path_str(found.def_id)));
57145706
}
57155707
}
57165708

0 commit comments

Comments
 (0)