experimenting

estebank · estebank · commit 9946f84583f2 · 2016-09-30T17:54:05.000-07:00
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
@@ -244,27 +244,27 @@ impl<'tcx> ImplOrTraitItem<'tcx> {
                         match node.span() {
                             Some(span) => match tcx.sess.codemap().span_to_oneline_snippet(span) {
                                 Ok(snippet) => snippet,
-                                Err(_) => item.signature(),
+                                Err(_) => item.signature(tcx),
                             },
-                            None => item.signature(),
+                            None => item.signature(tcx),
                         }
                     }
-                    None => item.signature(),
+                    None => item.signature(tcx),
                 }
             }
-            TypeTraitItem(ref item) => item.signature(),
+            TypeTraitItem(ref item) => item.signature(tcx),
             ConstTraitItem(ref item) => {
                 match tcx.map.get_if_local(item.def_id) {
                     Some(node) => {
                         match node.span() {
                             Some(span) => match tcx.sess.codemap().span_to_oneline_snippet(span) {
                                 Ok(snippet) => snippet,
-                                Err(_) => item.signature(),
+                                Err(_) => item.signature(tcx),
                             },
-                            None => item.signature(),
+                            None => item.signature(tcx),
                         }
                     }
-                    None => item.signature(),
+                    None => item.signature(tcx),
                 }
             }
         }
@@ -362,7 +362,7 @@ impl<'tcx> Method<'tcx> {
         }
     }
 
-    pub fn signature(&self) -> String {
+    pub fn signature<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>) -> String {
         let name = self.name.to_string();
         let unsafety = match self.fty.unsafety {
             hir::Unsafety::Unsafe => "unsafe ",
@@ -379,6 +379,7 @@ impl<'tcx> Method<'tcx> {
         };
         let args = self.fty.sig.inputs().0.iter()
             .map(|t| format!("{:?}", t)).collect::<Vec<_>>().join(", ");
+        //let return_type = format!("{}", tcx.item_name(self.fty.sig.output().0.def_id).as_str());
         let return_type = format!("{:?}", self.fty.sig.output().0);
         let return_signature = if &return_type == "()" {
             "".to_string()
@@ -387,7 +388,8 @@ impl<'tcx> Method<'tcx> {
         };
 
         // unsafe fn name<'a, T>(args) -> ReturnType
-        format!("{}fn {}{}({}){};", unsafety, name, type_args, args, return_signature)
+        //format!("{}fn {}{}({}){};", unsafety, name, type_args, args, return_signature)
+        format!("{}fn {}", unsafety, self.fty.sig.0)//name, type_args, args, return_signature)
     }
 }
 
@@ -417,13 +419,14 @@ pub struct AssociatedConst<'tcx> {
 }
 
 impl<'tcx> AssociatedConst<'tcx> {
-    pub fn signature(&self) -> String {
+    pub fn signature<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>) -> String {
         // const FOO: Type = DEFAULT;
         let value = if self.has_value {
             " = <DEFAULT>"
         } else {
             ""
         };
+        //format!("const {}: {}{};", self.name.to_string(), tcx.item_name(self.ty.def_id).as_str(), value)
         format!("const {}: {:?}{};", self.name.to_string(), self.ty, value)
     }
 }
@@ -439,7 +442,7 @@ pub struct AssociatedType<'tcx> {
 }
 
 impl<'tcx> AssociatedType<'tcx> {
-    pub fn signature(&self) -> String {
+    pub fn signature<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>) -> String {
         //// type Type;
         format!("type {};", self.name.to_string())
     }
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
@@ -151,6 +151,8 @@ impl EmitterWriter {
                 let mut hi = cm.lookup_char_pos(span_label.span.hi);
                 let mut is_minimized = false;
 
+                let start = lo.line;
+                let end = hi.line + 1;
                 // If the span is multi-line, simplify down to the span of one character
                 if lo.line != hi.line {
                     hi.line = lo.line;
@@ -167,16 +169,18 @@ impl EmitterWriter {
                     hi.col = CharPos(lo.col.0 + 1);
                 }
 
-                add_annotation_to_file(&mut output,
-                                        lo.file,
-                                        lo.line,
-                                        Annotation {
-                                            start_col: lo.col.0,
-                                            end_col: hi.col.0,
-                                            is_primary: span_label.is_primary,
-                                            is_minimized: is_minimized,
-                                            label: span_label.label.clone(),
-                                        });
+                for line in start..end {
+                    add_annotation_to_file(&mut output,
+                                            lo.file.clone(),
+                                            line,
+                                            Annotation {
+                                                start_col: lo.col.0,
+                                                end_col: hi.col.0,
+                                                is_primary: span_label.is_primary,
+                                                is_minimized: is_minimized,
+                                                label: span_label.label.clone(),
+                                            });
+                }
             }
         }
         output
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
@@ -52,7 +52,7 @@ pub mod registry;
 pub mod styled_buffer;
 mod lock;
 
-use syntax_pos::{BytePos, Loc, FileLinesResult, FileName, MultiSpan, Span, NO_EXPANSION };
+use syntax_pos::{BytePos, Loc, FileLinesResult, FileName, MultiSpan, Span, NO_EXPANSION};
 use syntax_pos::{MacroBacktrace};
 
 #[derive(Clone)]
diff --git a/src/librustc_typeck/check/compare_method.rs b/src/librustc_typeck/check/compare_method.rs
@@ -87,8 +87,7 @@ pub fn compare_impl_method<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
                 err.span_label(span, & format!("`{}` used in trait",
                                                trait_m.explicit_self));
             }
-            err.note(&format!("Expected signature: {}", trait_m.signature()));
-            err.note(&format!("   Found signature: {}", impl_m.signature()));
+
             err.emit();
             return;
         }
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
@@ -1124,7 +1124,12 @@ fn check_impl_items_against_trait<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
                     .collect::<Vec<_>>().join("`, `"))
             );
         for trait_item in missing_items {
-            err.note(&(trait_item.signature(tcx)));
+            err.note(&format!("definition {}", trait_item.signature(tcx)));
+            //err.note(&format!("node {:?}", tcx.map.trait_item.signature(tcx)));
+            if let Some(span) = tcx.map.span_if_local(trait_item.def_id()) {
+                //struct_span_err!(tcx.sess, span, E0046, "definition").emit();
+                err.span_note(span, "definition");//.emit();
+            }
         }
         err.emit();
     }

Original file line number	Diff line number	Diff line change
`@@ -244,27 +244,27 @@ impl<'tcx> ImplOrTraitItem<'tcx> {`
`244`	`244`	`match node.span() {`
`245`	`245`	`Some(span) => match tcx.sess.codemap().span_to_oneline_snippet(span) {`
`246`	`246`	`Ok(snippet) => snippet,`
`247`		`- Err(_) => item.signature(),`
	`247`	`+ Err(_) => item.signature(tcx),`
`248`	`248`	`},`
`249`		`- None => item.signature(),`
	`249`	`+ None => item.signature(tcx),`
`250`	`250`	`}`
`251`	`251`	`}`
`252`		`- None => item.signature(),`
	`252`	`+ None => item.signature(tcx),`
`253`	`253`	`}`
`254`	`254`	`}`
`255`		`- TypeTraitItem(ref item) => item.signature(),`
	`255`	`+ TypeTraitItem(ref item) => item.signature(tcx),`
`256`	`256`	`ConstTraitItem(ref item) => {`
`257`	`257`	`match tcx.map.get_if_local(item.def_id) {`
`258`	`258`	`Some(node) => {`
`259`	`259`	`match node.span() {`
`260`	`260`	`Some(span) => match tcx.sess.codemap().span_to_oneline_snippet(span) {`
`261`	`261`	`Ok(snippet) => snippet,`
`262`		`- Err(_) => item.signature(),`
	`262`	`+ Err(_) => item.signature(tcx),`
`263`	`263`	`},`
`264`		`- None => item.signature(),`
	`264`	`+ None => item.signature(tcx),`
`265`	`265`	`}`
`266`	`266`	`}`
`267`		`- None => item.signature(),`
	`267`	`+ None => item.signature(tcx),`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`}`
`@@ -362,7 +362,7 @@ impl<'tcx> Method<'tcx> {`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
`365`		`- pub fn signature(&self) -> String {`
	`365`	`+ pub fn signature<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>) -> String {`
`366`	`366`	`let name = self.name.to_string();`
`367`	`367`	`let unsafety = match self.fty.unsafety {`
`368`	`368`	`hir::Unsafety::Unsafe => "unsafe ",`
`@@ -379,6 +379,7 @@ impl<'tcx> Method<'tcx> {`
`379`	`379`	`};`
`380`	`380`	`let args = self.fty.sig.inputs().0.iter()`
`381`	`381`	`.map(\|t\| format!("{:?}", t)).collect::<Vec<_>>().join(", ");`
	`382`	`+ //let return_type = format!("{}", tcx.item_name(self.fty.sig.output().0.def_id).as_str());`
`382`	`383`	`let return_type = format!("{:?}", self.fty.sig.output().0);`
`383`	`384`	`let return_signature = if &return_type == "()" {`
`384`	`385`	`"".to_string()`
`@@ -387,7 +388,8 @@ impl<'tcx> Method<'tcx> {`
`387`	`388`	`};`
`388`	`389`
`389`	`390`	`// unsafe fn name<'a, T>(args) -> ReturnType`
`390`		`- format!("{}fn {}{}({}){};", unsafety, name, type_args, args, return_signature)`
	`391`	`+ //format!("{}fn {}{}({}){};", unsafety, name, type_args, args, return_signature)`
	`392`	`+ format!("{}fn {}", unsafety, self.fty.sig.0)//name, type_args, args, return_signature)`
`391`	`393`	`}`
`392`	`394`	`}`
`393`	`395`
`@@ -417,13 +419,14 @@ pub struct AssociatedConst<'tcx> {`
`417`	`419`	`}`
`418`	`420`
`419`	`421`	`impl<'tcx> AssociatedConst<'tcx> {`
`420`		`- pub fn signature(&self) -> String {`
	`422`	`+ pub fn signature<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>) -> String {`
`421`	`423`	`// const FOO: Type = DEFAULT;`
`422`	`424`	`let value = if self.has_value {`
`423`	`425`	`" = <DEFAULT>"`
`424`	`426`	`} else {`
`425`	`427`	`""`
`426`	`428`	`};`
	`429`	`+ //format!("const {}: {}{};", self.name.to_string(), tcx.item_name(self.ty.def_id).as_str(), value)`
`427`	`430`	`format!("const {}: {:?}{};", self.name.to_string(), self.ty, value)`
`428`	`431`	`}`
`429`	`432`	`}`
`@@ -439,7 +442,7 @@ pub struct AssociatedType<'tcx> {`
`439`	`442`	`}`
`440`	`443`
`441`	`444`	`impl<'tcx> AssociatedType<'tcx> {`
`442`		`- pub fn signature(&self) -> String {`
	`445`	`+ pub fn signature<'a>(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>) -> String {`
`443`	`446`	`//// type Type;`
`444`	`447`	`format!("type {};", self.name.to_string())`
`445`	`448`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,7 @@ pub fn compare_impl_method<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,`
`87`	`87`	err.span_label(span, & format!("`{}` used in trait",
`88`	`88`	`trait_m.explicit_self));`
`89`	`89`	`}`
`90`		`- err.note(&format!("Expected signature: {}", trait_m.signature()));`
`91`		`- err.note(&format!(" Found signature: {}", impl_m.signature()));`
	`90`	`+`
`92`	`91`	`err.emit();`
`93`	`92`	`return;`
`94`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1124,7 +1124,12 @@ fn check_impl_items_against_trait<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,`
`1124`	`1124`	.collect::<Vec<_>>().join("`, `"))
`1125`	`1125`	`);`
`1126`	`1126`	`for trait_item in missing_items {`
`1127`		`- err.note(&(trait_item.signature(tcx)));`
	`1127`	`+ err.note(&format!("definition {}", trait_item.signature(tcx)));`
	`1128`	`+ //err.note(&format!("node {:?}", tcx.map.trait_item.signature(tcx)));`
	`1129`	`+ if let Some(span) = tcx.map.span_if_local(trait_item.def_id()) {`
	`1130`	`+ //struct_span_err!(tcx.sess, span, E0046, "definition").emit();`
	`1131`	`+ err.span_note(span, "definition");//.emit();`
	`1132`	`+ }`
`1128`	`1133`	`}`
`1129`	`1134`	`err.emit();`
`1130`	`1135`	`}`