aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack O'Connor <[email protected]>2023-03-25 16:02:01 -0700
committerJack O'Connor <[email protected]>2023-03-25 16:36:37 -0700
commita9750c7fec924db6a20fc87fa90269cdecbe75bd (patch)
tree620b9ff7c74b3b2bdb2a9e543c12924a882cd60f
parent64747d48ffe9d1fbf4b71e94cabeb8a211461081 (diff)
upgrade all Cargo.toml files to edition=2021
The MSRV is already 1.60, so this doesn't affect much. The only impact to other code is that we no longer need to explicitly import TryInto.
-rw-r--r--Cargo.toml2
-rw-r--r--b3sum/Cargo.toml2
-rw-r--r--b3sum/src/main.rs1
-rw-r--r--c/blake3_c_rust_bindings/Cargo.toml2
-rw-r--r--reference_impl/Cargo.toml2
-rw-r--r--reference_impl/reference_impl.rs1
-rw-r--r--test_vectors/Cargo.toml2
-rw-r--r--test_vectors/src/lib.rs1
-rw-r--r--tools/compiler_version/Cargo.toml2
-rw-r--r--tools/instruction_set_support/Cargo.toml2
10 files changed, 7 insertions, 10 deletions
diff --git a/Cargo.toml b/Cargo.toml
index d3e4371..40b1f81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/BLAKE3-team/BLAKE3"
license = "CC0-1.0 OR Apache-2.0"
documentation = "https://docs.rs/blake3"
readme = "README.md"
-edition = "2018"
+edition = "2021"
[features]
default = ["std"]
diff --git a/b3sum/Cargo.toml b/b3sum/Cargo.toml
index a050fb2..1712503 100644
--- a/b3sum/Cargo.toml
+++ b/b3sum/Cargo.toml
@@ -6,7 +6,7 @@ description = "a command line implementation of the BLAKE3 hash function"
repository = "https://github.com/BLAKE3-team/BLAKE3"
license = "CC0-1.0 OR Apache-2.0"
readme = "README.md"
-edition = "2018"
+edition = "2021"
[features]
neon = ["blake3/neon"]
diff --git a/b3sum/src/main.rs b/b3sum/src/main.rs
index 0af88bb..2b61a67 100644
--- a/b3sum/src/main.rs
+++ b/b3sum/src/main.rs
@@ -1,7 +1,6 @@
use anyhow::{bail, ensure, Result};
use clap::Parser;
use std::cmp;
-use std::convert::TryInto;
use std::fs::File;
use std::io;
use std::io::prelude::*;
diff --git a/c/blake3_c_rust_bindings/Cargo.toml b/c/blake3_c_rust_bindings/Cargo.toml
index a5f0e97..fff9f41 100644
--- a/c/blake3_c_rust_bindings/Cargo.toml
+++ b/c/blake3_c_rust_bindings/Cargo.toml
@@ -7,7 +7,7 @@
name = "blake3_c_rust_bindings"
version = "0.0.0"
description = "TESTING ONLY Rust bindings for the BLAKE3 C implementation"
-edition = "2018"
+edition = "2021"
[features]
# By default the x86-64 build uses assembly implementations. This feature makes
diff --git a/reference_impl/Cargo.toml b/reference_impl/Cargo.toml
index 8c81e5a..e269fe9 100644
--- a/reference_impl/Cargo.toml
+++ b/reference_impl/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "reference_impl"
version = "0.0.0"
-edition = "2018"
+edition = "2021"
[lib]
name = "reference_impl"
diff --git a/reference_impl/reference_impl.rs b/reference_impl/reference_impl.rs
index 83ac795..72ad525 100644
--- a/reference_impl/reference_impl.rs
+++ b/reference_impl/reference_impl.rs
@@ -18,7 +18,6 @@
//! ```
use core::cmp::min;
-use core::convert::TryInto;
const OUT_LEN: usize = 32;
const KEY_LEN: usize = 32;
diff --git a/test_vectors/Cargo.toml b/test_vectors/Cargo.toml
index cd74a9d..87a9eba 100644
--- a/test_vectors/Cargo.toml
+++ b/test_vectors/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "test_vectors"
version = "0.0.0"
-edition = "2018"
+edition = "2021"
[features]
neon = ["blake3/neon"]
diff --git a/test_vectors/src/lib.rs b/test_vectors/src/lib.rs
index eea5528..c6dc2c8 100644
--- a/test_vectors/src/lib.rs
+++ b/test_vectors/src/lib.rs
@@ -142,7 +142,6 @@ pub fn parse_test_cases() -> Cases {
#[cfg(test)]
mod tests {
use super::*;
- use std::convert::TryInto;
fn test_reference_impl_all_at_once(
key: &[u8; blake3::KEY_LEN],
diff --git a/tools/compiler_version/Cargo.toml b/tools/compiler_version/Cargo.toml
index 1046cf2..8625094 100644
--- a/tools/compiler_version/Cargo.toml
+++ b/tools/compiler_version/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "compiler_version"
version = "0.0.0"
-edition = "2018"
+edition = "2021"
[build-dependencies]
cc = "1.0.50"
diff --git a/tools/instruction_set_support/Cargo.toml b/tools/instruction_set_support/Cargo.toml
index 9e30174..eef8a80 100644
--- a/tools/instruction_set_support/Cargo.toml
+++ b/tools/instruction_set_support/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "instruction_set_support"
version = "0.0.0"
-edition = "2018"
+edition = "2021"
[dependencies]