---

colrdavidson · colrdavidson · commit 9dc45d63b0c2 · 2014-09-21T01:19:49.000-04:00
yaml --- r: 155290 b: refs/heads/try2 c: 88b98a0 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d7e1bb5ff4622694d48905e944c1cf9bea7a5da7
+refs/heads/try2: 88b98a0603ee9410a8fe5949210720e5ccd9c026
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustc/middle/resolve.rs b/branches/try2/src/librustc/middle/resolve.rs
@@ -2928,7 +2928,7 @@ impl<'a> Resolver<'a> {
                             Some(span) => {
                                 self.session
                                     .span_note(span,
-                                               "note conflicting value here");
+                                               "conflicting value here");
                             }
                         }
                     }
@@ -2951,7 +2951,7 @@ impl<'a> Resolver<'a> {
                             Some(span) => {
                                 self.session
                                     .span_note(span,
-                                               "note conflicting type here")
+                                               "conflicting type here")
                             }
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -2928,7 +2928,7 @@ impl<'a> Resolver<'a> {`
`2928`	`2928`	`Some(span) => {`
`2929`	`2929`	`self.session`
`2930`	`2930`	`.span_note(span,`
`2931`		`- "note conflicting value here");`
	`2931`	`+ "conflicting value here");`
`2932`	`2932`	`}`
`2933`	`2933`	`}`
`2934`	`2934`	`}`
`@@ -2951,7 +2951,7 @@ impl<'a> Resolver<'a> {`
`2951`	`2951`	`Some(span) => {`
`2952`	`2952`	`self.session`
`2953`	`2953`	`.span_note(span,`
`2954`		`- "note conflicting type here")`
	`2954`	`+ "conflicting type here")`
`2955`	`2955`	`}`
`2956`	`2956`	`}`
`2957`	`2957`	`}`