Skip to content

Commit fc035dd

Browse files
authored
Merge branch 'master' into extraneous-bytes-after-sos
2 parents b9e7f55 + b25744e commit fc035dd

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: rust
22
rust:
3-
- 1.28.0
3+
- 1.34.2
44
- stable
55
- beta
66
- nightly

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ fn main() {
3232
```
3333

3434
## Requirements
35-
This crate compiles only with rust >= 1.28.
35+
This crate compiles only with rust >= 1.34.

src/decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ impl<R: Read> Decoder<R> {
232232
Marker::DQT => {
233233
let tables = parse_dqt(&mut self.reader)?;
234234

235-
for (i, &table) in tables.into_iter().enumerate() {
235+
for (i, &table) in tables.iter().enumerate() {
236236
if let Some(table) = table {
237237
let mut unzigzagged_table = [0u16; 64];
238238

src/marker.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ impl Marker {
132132
0xFD => Some(JPGn(13)),
133133
0xFE => Some(COM),
134134
0xFF => None, // Fill byte
135-
_ => unreachable!(),
136135
}
137136
}
138137
}

0 commit comments

Comments
 (0)