Skip to content

Commit

Permalink
fix warn(array_into_iter) (deprecation of <&[T; N] as IntoIterator>::…
Browse files Browse the repository at this point in the history 
…into_iter)

e.g.:
warning: this method call currently resolves to `<&[T; N] as IntoIterator>::into_iter` (due to autoref coercions), but that might change in the future when `IntoIterator` impls for arrays are added.
  --> tests/serialize.rs:15:18
   |
15 |                 .into_iter()
   |                  ^^^^^^^^^ help: use `.iter()` instead of `.into_iter()` to avoid ambiguity: `iter`
   |
   = note: `#[warn(array_into_iter)]` on by default
   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
   = note: for more information, see issue #66145 <rust-lang/rust#66145>
  • Loading branch information
@fogti
fogti committed Apr 7, 2021
1 parent d5ea74e commit 91acf67
Showing 1 changed file with 50 additions and 150 deletions.
200 changes: 50 additions & 150 deletions tests/serialize.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,22 @@ fn serializes_regular_file() {
.chain(
13u64
.to_le_bytes()
.into_iter()
.iter()
.chain(b"nix-archive-1")
.chain(&[0u8; 3]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b"(").chain(&[0u8; 7]))
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"type")
.chain(&[0u8; 4]),
)
.chain(
7u64.to_le_bytes()
.into_iter()
.chain(b"regular")
.chain(&[0u8; 1]),
)
.chain(8u64.to_le_bytes().into_iter().chain(b"contents"))
.chain(1u64.to_le_bytes().iter().chain(b"(").chain(&[0u8; 7]))
.chain(4u64.to_le_bytes().iter().chain(b"type").chain(&[0u8; 4]))
.chain(7u64.to_le_bytes().iter().chain(b"regular").chain(&[0u8; 1]))
.chain(8u64.to_le_bytes().iter().chain(b"contents"))
.chain(
27u8.to_le_bytes()
.into_iter()
.iter()
.chain(&[0u8; 7])
.chain("lorem ipsum dolor sic amet\n".as_bytes())
.chain(&[0u8; 5]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().iter().chain(b")").chain(&[0u8; 7]))
.copied()
.collect();

Expand All @@ -61,40 +51,30 @@ fn serializes_executable_file() {
.chain(
13u64
.to_le_bytes()
.into_iter()
.iter()
.chain(b"nix-archive-1")
.chain(&[0u8; 3]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b"(").chain(&[0u8; 7]))
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"type")
.chain(&[0u8; 4]),
)
.chain(
7u64.to_le_bytes()
.into_iter()
.chain(b"regular")
.chain(&[0u8; 1]),
)
.chain(1u64.to_le_bytes().iter().chain(b"(").chain(&[0u8; 7]))
.chain(4u64.to_le_bytes().iter().chain(b"type").chain(&[0u8; 4]))
.chain(7u64.to_le_bytes().iter().chain(b"regular").chain(&[0u8; 1]))
.chain(
10u8.to_le_bytes()
.into_iter()
.iter()
.chain(&[0u8; 7])
.chain(b"executable")
.chain(&[0u8; 5]),
)
.chain(0u8.to_le_bytes().into_iter().chain(b"").chain(&[0u8; 8]))
.chain(8u64.to_le_bytes().into_iter().chain(b"contents"))
.chain(0u8.to_le_bytes().iter().chain(b"").chain(&[0u8; 8]))
.chain(8u64.to_le_bytes().iter().chain(b"contents"))
.chain(
35u8.to_le_bytes()
.into_iter()
.iter()
.chain(&[0u8; 7])
.chain("#!/bin/sh\nset -euo pipefail\nexit 0\n".as_bytes())
.chain(&[0u8; 5]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().iter().chain(b")").chain(&[0u8; 7]))
.copied()
.collect();

Expand All @@ -111,36 +91,16 @@ fn serializes_symlink() {
.chain(
13u64
.to_le_bytes()
.into_iter()
.iter()
.chain(b"nix-archive-1")
.chain(&[0u8; 3]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b"(").chain(&[0u8; 7]))
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"type")
.chain(&[0u8; 4]),
)
.chain(
7u64.to_le_bytes()
.into_iter()
.chain(b"symlink")
.chain(&[0u8; 1]),
)
.chain(
6u64.to_le_bytes()
.into_iter()
.chain(b"target")
.chain(&[0u8; 2]),
)
.chain(
5u64.to_le_bytes()
.into_iter()
.chain(b"./foo")
.chain(&[0u8; 3]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().iter().chain(b"(").chain(&[0u8; 7]))
.chain(4u64.to_le_bytes().iter().chain(b"type").chain(&[0u8; 4]))
.chain(7u64.to_le_bytes().iter().chain(b"symlink").chain(&[0u8; 1]))
.chain(6u64.to_le_bytes().iter().chain(b"target").chain(&[0u8; 2]))
.chain(5u64.to_le_bytes().iter().chain(b"./foo").chain(&[0u8; 3]))
.chain(1u64.to_le_bytes().iter().chain(b")").chain(&[0u8; 7]))
.copied()
.collect();

Expand All @@ -158,112 +118,52 @@ fn serializes_directory() {
.chain(
13u64
.to_le_bytes()
.into_iter()
.iter()
.chain(b"nix-archive-1")
.chain(&[0u8; 3]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b"(").chain(&[0u8; 7]))
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"type")
.chain(&[0u8; 4]),
)
.chain(1u64.to_le_bytes().iter().chain(b"(").chain(&[0u8; 7]))
.chain(4u64.to_le_bytes().iter().chain(b"type").chain(&[0u8; 4]))
.chain(
9u64.to_le_bytes()
.into_iter()
.iter()
.chain(b"directory")
.chain(&[0u8; 7]),
)
.chain(
5u64.to_le_bytes()
.into_iter()
.chain(b"entry")
.chain(&[0u8; 3]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b"(").chain(&[0u8; 7]))
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"name")
.chain(&[0u8; 4]),
)
.chain(
6u64.to_le_bytes()
.into_iter()
.chain(b"subdir")
.chain(&[0u8; 2]),
)
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"node")
.chain(&[0u8; 4]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b"(").chain(&[0u8; 7]))
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"type")
.chain(&[0u8; 4]),
)
.chain(5u64.to_le_bytes().iter().chain(b"entry").chain(&[0u8; 3]))
.chain(1u64.to_le_bytes().iter().chain(b"(").chain(&[0u8; 7]))
.chain(4u64.to_le_bytes().iter().chain(b"name").chain(&[0u8; 4]))
.chain(6u64.to_le_bytes().iter().chain(b"subdir").chain(&[0u8; 2]))
.chain(4u64.to_le_bytes().iter().chain(b"node").chain(&[0u8; 4]))
.chain(1u64.to_le_bytes().iter().chain(b"(").chain(&[0u8; 7]))
.chain(4u64.to_le_bytes().iter().chain(b"type").chain(&[0u8; 4]))
.chain(
9u64.to_le_bytes()
.into_iter()
.iter()
.chain(b"directory")
.chain(&[0u8; 7]),
)
.chain(
5u64.to_le_bytes()
.into_iter()
.chain(b"entry")
.chain(&[0u8; 3]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b"(").chain(&[0u8; 7]))
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"name")
.chain(&[0u8; 4]),
)
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"file")
.chain(&[0u8; 4]),
)
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"node")
.chain(&[0u8; 4]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b"(").chain(&[0u8; 7]))
.chain(
4u64.to_le_bytes()
.into_iter()
.chain(b"type")
.chain(&[0u8; 4]),
)
.chain(
7u64.to_le_bytes()
.into_iter()
.chain(b"regular")
.chain(&[0u8; 1]),
)
.chain(8u64.to_le_bytes().into_iter().chain(b"contents"))
.chain(5u64.to_le_bytes().iter().chain(b"entry").chain(&[0u8; 3]))
.chain(1u64.to_le_bytes().iter().chain(b"(").chain(&[0u8; 7]))
.chain(4u64.to_le_bytes().iter().chain(b"name").chain(&[0u8; 4]))
.chain(4u64.to_le_bytes().iter().chain(b"file").chain(&[0u8; 4]))
.chain(4u64.to_le_bytes().iter().chain(b"node").chain(&[0u8; 4]))
.chain(1u64.to_le_bytes().iter().chain(b"(").chain(&[0u8; 7]))
.chain(4u64.to_le_bytes().iter().chain(b"type").chain(&[0u8; 4]))
.chain(7u64.to_le_bytes().iter().chain(b"regular").chain(&[0u8; 1]))
.chain(8u64.to_le_bytes().iter().chain(b"contents"))
.chain(
11u64
.to_le_bytes()
.into_iter()
.iter()
.chain("hello world".as_bytes())
.chain(&[0u8; 5]),
)
.chain(1u64.to_le_bytes().into_iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().into_iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().into_iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().into_iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().into_iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().iter().chain(b")").chain(&[0u8; 7]))
.chain(1u64.to_le_bytes().iter().chain(b")").chain(&[0u8; 7]))
.copied()
.collect();

Expand Down

0 comments on commit 91acf67

Please sign in to comment.