File tree Expand file tree Collapse file tree 2 files changed +4
-12
lines changed
branches/try/src/librustc/middle Expand file tree Collapse file tree 2 files changed +4
-12
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
3
3
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4
- refs/heads/try: f357d559ca0835ba2fcad11eb30a8ce821b6df58
4
+ refs/heads/try: d81feb85f7b575b04a7249ccbf3a6b3fcc8c0e9d
5
5
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
6
6
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
7
7
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change @@ -5683,13 +5683,9 @@ impl<'tcx> ctxt<'tcx> {
5683
5683
& format ! ( "a default was defined here..." ) ) ;
5684
5684
}
5685
5685
( _, _) => {
5686
- let elems = csearch:: get_item_path ( self , expected. def_id )
5687
- . into_iter ( )
5688
- . map ( |p| p. to_string ( ) )
5689
- . collect :: < Vec < _ > > ( ) ;
5690
5686
self . sess . note (
5691
5687
& format ! ( "a default is defined on `{}`" ,
5692
- elems . join ( "::" ) ) ) ;
5688
+ self . item_path_str ( expected . def_id ) ) ) ;
5693
5689
}
5694
5690
}
5695
5691
@@ -5704,13 +5700,9 @@ impl<'tcx> ctxt<'tcx> {
5704
5700
& format ! ( "a second default was defined here..." ) ) ;
5705
5701
}
5706
5702
( _, _) => {
5707
- let elems = csearch:: get_item_path ( self , found. def_id )
5708
- . into_iter ( )
5709
- . map ( |p| p. to_string ( ) )
5710
- . collect :: < Vec < _ > > ( ) ;
5711
-
5712
5703
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) ) ) ;
5714
5706
}
5715
5707
}
5716
5708
You can’t perform that action at this time.
0 commit comments