Skip to content

Commit 9286200

Browse files
committed
---
yaml --- r: 232440 b: refs/heads/try c: d81feb8 h: refs/heads/master v: v3
1 parent af819e7 commit 9286200

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,7 +1,7 @@
11
---
22
refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: f357d559ca0835ba2fcad11eb30a8ce821b6df58
4+
refs/heads/try: d81feb85f7b575b04a7249ccbf3a6b3fcc8c0e9d
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/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)