bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #21396: japaric/no-parens-in-range

Browse source 
Conflicts:
	src/libsyntax/parse/lexer/comments.rs
This commit is contained in:
Alex Crichton 2015-01-21 09:15:15 -08:00
commit 1646707c6e
38 changed files with 70 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libserialize/json.rs
View file

@ -1298,7 +1298,7 @@ impl Stack {
InternalIndex(i) => StackElement::Index(i),
InternalKey(start, size) => {
StackElement::Key(str::from_utf8(
&self.str_buffer[(start as uint) .. (start as uint + size as uint)])
&self.str_buffer[start as uint .. start as uint + size as uint])
.unwrap())
}
}
@ -1341,7 +1341,7 @@ impl Stack {
Some(&InternalIndex(i)) => Some(StackElement::Index(i)),
Some(&InternalKey(start, size)) => {
Some(StackElement::Key(str::from_utf8(
&self.str_buffer[(start as uint) .. (start+size) as uint]
&self.str_buffer[start as uint .. (start+size) as uint]
).unwrap()))
}
}