diff options
| author | bors <bors@rust-lang.org> | 2014-12-16 08:42:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-16 08:42:40 +0000 |
| commit | 41f5907fa6b04614821277dd63172c5c8f11b6cd (patch) | |
| tree | 0d01fe703bde512c2174b650808fbdccf0562f51 /src/libsyntax/parse | |
| parent | cdd8b5b5eac3551dcf17ab04888d5052bf870804 (diff) | |
| parent | 1718cd6ee0f27ec8b7ad3038c1985a0acf0bebdb (diff) | |
| download | rust-41f5907fa6b04614821277dd63172c5c8f11b6cd.tar.gz rust-41f5907fa6b04614821277dd63172c5c8f11b6cd.zip | |
auto merge of #19777 : nikomatsakis/rust/warn-on-shadowing, r=acrichto
per rfc 459 cc https://github.com/rust-lang/rust/issues/19390 One question is: should we start by warning, and only switch to hard error later? I think we discussed something like this in the meeting. r? @alexcrichton
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 50c7258fe1c..da908f46ff6 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -275,8 +275,8 @@ impl<'a> StringReader<'a> { } /// Converts CRLF to LF in the given string, raising an error on bare CR. - fn translate_crlf<'a>(&self, start: BytePos, - s: &'a str, errmsg: &'a str) -> str::CowString<'a> { + fn translate_crlf<'b>(&self, start: BytePos, + s: &'b str, errmsg: &'b str) -> str::CowString<'b> { let mut i = 0u; while i < s.len() { let str::CharRange { ch, next } = s.char_range_at(i); |