diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2022-12-15 17:53:36 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2022-12-23 10:52:57 +0100 |
commit | f4d4c9804a29d69ad7b88147c07f5d2639fb7d88 (patch) | |
tree | 4163119d7e22171b73f13e6f3edc3ce90be9cec5 /buffered-reader | |
parent | 75bb553e573da523c78ef33a4b92bd57f34c73b2 (diff) |
Port to Rust Edition 2021.
Diffstat (limited to 'buffered-reader')
-rw-r--r-- | buffered-reader/Cargo.toml | 2 | ||||
-rw-r--r-- | buffered-reader/src/lib.rs | 2 | ||||
-rw-r--r-- | buffered-reader/src/macros.rs | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/buffered-reader/Cargo.toml b/buffered-reader/Cargo.toml index 4d3b2719..2456f658 100644 --- a/buffered-reader/Cargo.toml +++ b/buffered-reader/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://sequoia-pgp.org/" repository = "https://gitlab.com/sequoia-pgp/sequoia" readme = "README.md" license = "LGPL-2.0-or-later" -edition = "2018" +edition = "2021" rust-version = "1.60" [badges] diff --git a/buffered-reader/src/lib.rs b/buffered-reader/src/lib.rs index 28f63a62..db9a5b46 100644 --- a/buffered-reader/src/lib.rs +++ b/buffered-reader/src/lib.rs @@ -184,7 +184,7 @@ //! //! # f(); fn f() -> Result<(), std::io::Error> { //! # const FILENAME : &str = "/dev/null"; -//! let mut br : Box<BufferedReader<()>> +//! let mut br : Box<dyn BufferedReader<()>> //! = Box::new(buffered_reader::File::open(FILENAME)?); //! //! // While we haven't reached EOF (i.e., we can read at diff --git a/buffered-reader/src/macros.rs b/buffered-reader/src/macros.rs index eafb6add..5d9d5478 100644 --- a/buffered-reader/src/macros.rs +++ b/buffered-reader/src/macros.rs @@ -11,7 +11,6 @@ macro_rules! trace { // Converts an indentation level to whitespace. pub(crate) fn indent(i: isize) -> &'static str { - use std::convert::TryFrom; let s = " "; &s[0..usize::try_from(i).unwrap_or(0).min(s.len())] } |