Skip to content

Commit 528b057

Browse files
committed
---
yaml --- r: 233439 b: refs/heads/beta c: d81feb8 h: refs/heads/master i: 233437: 0b1cbfb 233435: 458c0f5 233431: 7e3778d 233423: 8a94896 233407: c42a57f v: v3
1 parent 3c638d8 commit 528b057

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
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: f357d559ca0835ba2fcad11eb30a8ce821b6df58
26+
refs/heads/beta: d81feb85f7b575b04a7249ccbf3a6b3fcc8c0e9d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

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