summaryrefslogtreecommitdiffstats
path: root/buffered-reader
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-07-09 12:51:10 +0200
committerJustus Winter <justus@sequoia-pgp.org>2019-07-15 12:47:53 +0200
commit775f0c039349335df880d35db7df6c131419f0eb (patch)
tree2d16928f3a629b7afae95cf1b9d518c5603a9f93 /buffered-reader
parentcaec575e3c44e6045e29aa452ad31f91d04ec139 (diff)
Prepare for Rust 2018.
- This is the result of running `cargo fix --edition`, with some manual adjustments. - The vast majority of changes merely qualify module paths with 'crate::'. - Two instances of adding an anonymous pattern to a trait's function. - `async` is a keyword in Rust 2018, and hence it needs to be escaped (e.g. in the case of the net::r#async module). - The manual adjustments were needed due to various shortcomings of the analysis employed by `cargo fix`, e.g. unexpanded macros, procedural macros, lalrpop grammars.
Diffstat (limited to 'buffered-reader')
-rw-r--r--buffered-reader/src/eof.rs2
-rw-r--r--buffered-reader/src/reserve.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/buffered-reader/src/eof.rs b/buffered-reader/src/eof.rs
index bf0dc7ef..c5a27e56 100644
--- a/buffered-reader/src/eof.rs
+++ b/buffered-reader/src/eof.rs
@@ -2,7 +2,7 @@ use std::io;
use std::io::{Error, ErrorKind, Read};
use std::fmt;
-use BufferedReader;
+use crate::BufferedReader;
/// Always returns EOF.
pub struct EOF<C> {
diff --git a/buffered-reader/src/reserve.rs b/buffered-reader/src/reserve.rs
index e490f8df..7c8e7ce9 100644
--- a/buffered-reader/src/reserve.rs
+++ b/buffered-reader/src/reserve.rs
@@ -160,7 +160,7 @@ mod test {
#[test]
fn data() {
- use ::Memory;
+ use crate::Memory;
// orig is the original buffer
//