Skip to content

Commit 67d8e4b

Browse files
committed
---
yaml --- r: 113767 b: refs/heads/master c: 169a57e h: refs/heads/master i: 113765: c99f2fd 113763: 4972268 113759: b84c0a4 v: v3
1 parent 4b359fa commit 67d8e4b

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 0e8e0b2ede175be6a4874700674b259c8c63c2cc
2+
refs/heads/master: 169a57ee8d301c44fb285cc95fc1309d96aa37ab
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
55
refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/src/libsyntax/ext/format.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ impl<'a, 'b> Context<'a, 'b> {
268268
fn verify_arg_type(&mut self, arg: Position, ty: ArgumentType) {
269269
match arg {
270270
Exact(arg) => {
271-
if arg < 0 || self.args.len() <= arg {
271+
if self.args.len() <= arg {
272272
let msg = format!("invalid reference to argument `{}` (there \
273273
are {} arguments)", arg, self.args.len());
274274
self.ecx.span_err(self.fmtsp, msg);

trunk/src/libterm/terminfo/parser/compiled.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,7 @@ pub fn parse(file: &mut io::Reader,
220220
if bools_bytes != 0 {
221221
for i in range(0, bools_bytes) {
222222
let b = try!(file.read_byte());
223-
if b < 0 {
224-
return Err("error: expected more bools but hit EOF".to_owned());
225-
} else if b == 1 {
223+
if b == 1 {
226224
bools_map.insert(bnames[i as uint].to_owned(), true);
227225
}
228226
}

0 commit comments

Comments
 (0)