Skip to content

Commit 50be15e

Browse files
authored
Merge pull request #290 from jakubadamw/nightly-compilation-warnings
Address compilation warnings in the Nightly channel of Rust
2 parents 36a16db + 718f2cb commit 50be15e

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

src/decoder/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl DecodingResult {
138138
}
139139
}
140140

141-
pub fn as_buffer(&mut self, start: usize) -> DecodingBuffer {
141+
pub fn as_buffer(&mut self, start: usize) -> DecodingBuffer<'_> {
142142
match *self {
143143
DecodingResult::U8(ref mut buf) => DecodingBuffer::U8(&mut buf[start..]),
144144
DecodingResult::U16(ref mut buf) => DecodingBuffer::U16(&mut buf[start..]),

src/encoder/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl<W: Write + Seek, K: TiffKind> TiffEncoder<W, K> {
198198
&mut self,
199199
width: u32,
200200
height: u32,
201-
) -> TiffResult<ImageEncoder<W, C, K>> {
201+
) -> TiffResult<ImageEncoder<'_, W, C, K>> {
202202
let encoder = Self::chain_directory(&mut self.writer, &mut self.last_ifd_chain)?;
203203
ImageEncoder::new(encoder, width, height, self.compression, self.predictor)
204204
}

src/encoder/tiff_value.rs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub trait TiffValue {
1515

1616
/// Access this value as an contiguous sequence of bytes.
1717
/// If their is no trivial representation, allocate it on the heap.
18-
fn data(&self) -> Cow<[u8]>;
18+
fn data(&self) -> Cow<'_, [u8]>;
1919

2020
/// Write this value to a TiffWriter.
2121
/// While the default implementation will work in all cases, it may require unnecessary allocations.
@@ -34,7 +34,7 @@ impl TiffValue for [u8] {
3434
self.len()
3535
}
3636

37-
fn data(&self) -> Cow<[u8]> {
37+
fn data(&self) -> Cow<'_, [u8]> {
3838
Cow::Borrowed(self)
3939
}
4040
}
@@ -47,7 +47,7 @@ impl TiffValue for [i8] {
4747
self.len()
4848
}
4949

50-
fn data(&self) -> Cow<[u8]> {
50+
fn data(&self) -> Cow<'_, [u8]> {
5151
Cow::Borrowed(bytecast::i8_as_ne_bytes(self))
5252
}
5353
}
@@ -60,7 +60,7 @@ impl TiffValue for [u16] {
6060
self.len()
6161
}
6262

63-
fn data(&self) -> Cow<[u8]> {
63+
fn data(&self) -> Cow<'_, [u8]> {
6464
Cow::Borrowed(bytecast::u16_as_ne_bytes(self))
6565
}
6666
}
@@ -73,7 +73,7 @@ impl TiffValue for [i16] {
7373
self.len()
7474
}
7575

76-
fn data(&self) -> Cow<[u8]> {
76+
fn data(&self) -> Cow<'_, [u8]> {
7777
Cow::Borrowed(bytecast::i16_as_ne_bytes(self))
7878
}
7979
}
@@ -86,7 +86,7 @@ impl TiffValue for [u32] {
8686
self.len()
8787
}
8888

89-
fn data(&self) -> Cow<[u8]> {
89+
fn data(&self) -> Cow<'_, [u8]> {
9090
Cow::Borrowed(bytecast::u32_as_ne_bytes(self))
9191
}
9292
}
@@ -99,7 +99,7 @@ impl TiffValue for [i32] {
9999
self.len()
100100
}
101101

102-
fn data(&self) -> Cow<[u8]> {
102+
fn data(&self) -> Cow<'_, [u8]> {
103103
Cow::Borrowed(bytecast::i32_as_ne_bytes(self))
104104
}
105105
}
@@ -112,7 +112,7 @@ impl TiffValue for [u64] {
112112
self.len()
113113
}
114114

115-
fn data(&self) -> Cow<[u8]> {
115+
fn data(&self) -> Cow<'_, [u8]> {
116116
Cow::Borrowed(bytecast::u64_as_ne_bytes(self))
117117
}
118118
}
@@ -125,7 +125,7 @@ impl TiffValue for [i64] {
125125
self.len()
126126
}
127127

128-
fn data(&self) -> Cow<[u8]> {
128+
fn data(&self) -> Cow<'_, [u8]> {
129129
Cow::Borrowed(bytecast::i64_as_ne_bytes(self))
130130
}
131131
}
@@ -138,7 +138,7 @@ impl TiffValue for [f32] {
138138
self.len()
139139
}
140140

141-
fn data(&self) -> Cow<[u8]> {
141+
fn data(&self) -> Cow<'_, [u8]> {
142142
// We write using native endian so this should be safe
143143
Cow::Borrowed(bytecast::f32_as_ne_bytes(self))
144144
}
@@ -152,7 +152,7 @@ impl TiffValue for [f64] {
152152
self.len()
153153
}
154154

155-
fn data(&self) -> Cow<[u8]> {
155+
fn data(&self) -> Cow<'_, [u8]> {
156156
// We write using native endian so this should be safe
157157
Cow::Borrowed(bytecast::f64_as_ne_bytes(self))
158158
}
@@ -171,7 +171,7 @@ impl TiffValue for u8 {
171171
Ok(())
172172
}
173173

174-
fn data(&self) -> Cow<[u8]> {
174+
fn data(&self) -> Cow<'_, [u8]> {
175175
Cow::Borrowed(from_ref(self))
176176
}
177177
}
@@ -189,7 +189,7 @@ impl TiffValue for i8 {
189189
Ok(())
190190
}
191191

192-
fn data(&self) -> Cow<[u8]> {
192+
fn data(&self) -> Cow<'_, [u8]> {
193193
Cow::Borrowed(bytecast::i8_as_ne_bytes(from_ref(self)))
194194
}
195195
}
@@ -207,7 +207,7 @@ impl TiffValue for u16 {
207207
Ok(())
208208
}
209209

210-
fn data(&self) -> Cow<[u8]> {
210+
fn data(&self) -> Cow<'_, [u8]> {
211211
Cow::Borrowed(bytecast::u16_as_ne_bytes(from_ref(self)))
212212
}
213213
}
@@ -225,7 +225,7 @@ impl TiffValue for i16 {
225225
Ok(())
226226
}
227227

228-
fn data(&self) -> Cow<[u8]> {
228+
fn data(&self) -> Cow<'_, [u8]> {
229229
Cow::Borrowed(bytecast::i16_as_ne_bytes(from_ref(self)))
230230
}
231231
}
@@ -243,7 +243,7 @@ impl TiffValue for u32 {
243243
Ok(())
244244
}
245245

246-
fn data(&self) -> Cow<[u8]> {
246+
fn data(&self) -> Cow<'_, [u8]> {
247247
Cow::Borrowed(bytecast::u32_as_ne_bytes(from_ref(self)))
248248
}
249249
}
@@ -261,7 +261,7 @@ impl TiffValue for i32 {
261261
Ok(())
262262
}
263263

264-
fn data(&self) -> Cow<[u8]> {
264+
fn data(&self) -> Cow<'_, [u8]> {
265265
Cow::Borrowed(bytecast::i32_as_ne_bytes(from_ref(self)))
266266
}
267267
}
@@ -279,7 +279,7 @@ impl TiffValue for u64 {
279279
Ok(())
280280
}
281281

282-
fn data(&self) -> Cow<[u8]> {
282+
fn data(&self) -> Cow<'_, [u8]> {
283283
Cow::Borrowed(bytecast::u64_as_ne_bytes(from_ref(self)))
284284
}
285285
}
@@ -297,7 +297,7 @@ impl TiffValue for i64 {
297297
Ok(())
298298
}
299299

300-
fn data(&self) -> Cow<[u8]> {
300+
fn data(&self) -> Cow<'_, [u8]> {
301301
Cow::Borrowed(bytecast::i64_as_ne_bytes(from_ref(self)))
302302
}
303303
}
@@ -315,7 +315,7 @@ impl TiffValue for f32 {
315315
Ok(())
316316
}
317317

318-
fn data(&self) -> Cow<[u8]> {
318+
fn data(&self) -> Cow<'_, [u8]> {
319319
Cow::Borrowed(bytecast::f32_as_ne_bytes(from_ref(self)))
320320
}
321321
}
@@ -333,7 +333,7 @@ impl TiffValue for f64 {
333333
Ok(())
334334
}
335335

336-
fn data(&self) -> Cow<[u8]> {
336+
fn data(&self) -> Cow<'_, [u8]> {
337337
Cow::Borrowed(bytecast::f64_as_ne_bytes(from_ref(self)))
338338
}
339339
}
@@ -351,7 +351,7 @@ impl TiffValue for Ifd {
351351
Ok(())
352352
}
353353

354-
fn data(&self) -> Cow<[u8]> {
354+
fn data(&self) -> Cow<'_, [u8]> {
355355
Cow::Borrowed(bytecast::u32_as_ne_bytes(from_ref(&self.0)))
356356
}
357357
}
@@ -369,7 +369,7 @@ impl TiffValue for Ifd8 {
369369
Ok(())
370370
}
371371

372-
fn data(&self) -> Cow<[u8]> {
372+
fn data(&self) -> Cow<'_, [u8]> {
373373
Cow::Borrowed(bytecast::u64_as_ne_bytes(from_ref(&self.0)))
374374
}
375375
}
@@ -388,7 +388,7 @@ impl TiffValue for Rational {
388388
Ok(())
389389
}
390390

391-
fn data(&self) -> Cow<[u8]> {
391+
fn data(&self) -> Cow<'_, [u8]> {
392392
Cow::Owned({
393393
let first_dword = bytecast::u32_as_ne_bytes(from_ref(&self.n));
394394
let second_dword = bytecast::u32_as_ne_bytes(from_ref(&self.d));
@@ -411,7 +411,7 @@ impl TiffValue for SRational {
411411
Ok(())
412412
}
413413

414-
fn data(&self) -> Cow<[u8]> {
414+
fn data(&self) -> Cow<'_, [u8]> {
415415
Cow::Owned({
416416
let first_dword = bytecast::i32_as_ne_bytes(from_ref(&self.n));
417417
let second_dword = bytecast::i32_as_ne_bytes(from_ref(&self.d));
@@ -438,7 +438,7 @@ impl TiffValue for str {
438438
}
439439
}
440440

441-
fn data(&self) -> Cow<[u8]> {
441+
fn data(&self) -> Cow<'_, [u8]> {
442442
Cow::Owned({
443443
if self.is_ascii() && !self.bytes().any(|b| b == 0) {
444444
let bytes: &[u8] = self.as_bytes();
@@ -462,7 +462,7 @@ impl<T: TiffValue + ?Sized> TiffValue for &'_ T {
462462
(*self).write(writer)
463463
}
464464

465-
fn data(&self) -> Cow<[u8]> {
465+
fn data(&self) -> Cow<'_, [u8]> {
466466
T::data(self)
467467
}
468468
}
@@ -484,7 +484,7 @@ macro_rules! impl_tiff_value_for_contiguous_sequence {
484484
Ok(())
485485
}
486486

487-
fn data(&self) -> Cow<[u8]> {
487+
fn data(&self) -> Cow<'_, [u8]> {
488488
let mut buf: Vec<u8> = Vec::with_capacity(Self::BYTE_LEN as usize * self.len());
489489
for x in self {
490490
buf.extend_from_slice(&x.data());

0 commit comments

Comments
 (0)