diff options
| author | bors <bors@rust-lang.org> | 2014-09-21 05:45:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-21 05:45:31 +0000 |
| commit | 1fb838d9945a09ebe16689e6ec0d6092cf7ef8cb (patch) | |
| tree | d42f6f2302c59d6f131d2280bb601d11d779ea6e /src | |
| parent | d7e1bb5ff4622694d48905e944c1cf9bea7a5da7 (diff) | |
| parent | 88b98a0603ee9410a8fe5949210720e5ccd9c026 (diff) | |
| download | rust-1fb838d9945a09ebe16689e6ec0d6092cf7ef8cb.tar.gz rust-1fb838d9945a09ebe16689e6ec0d6092cf7ef8cb.zip | |
auto merge of #17420 : anchovieshat/rust/grammar, r=huonw
Fix grammar (double "note") in situations like: src/reader/events.rs:120:5: 120:25 **note: note** conflicting type here src/reader/events.rs:120 Error(common::Error)
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/resolve.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 11ea84c75d3..cf80d91595e 100644 --- a/src/librustc/middle/resolve.rs +++ b/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") } } } |