OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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)
This commit is contained in:
bors 2014-09-21 05:45:31 +00:00
parent d7e1bb5ff4 88b98a0603
commit 1fb838d994
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc/middle/resolve.rs
View File

@ -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")
}
}
}