Skip to content

Commit 732a641

Browse files
authored
conduit-static: Use edition = 2018 (#48)
1 parent 1866116 commit 732a641

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

conduit-static/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ authors = ["wycats@gmail.com",
66
description = "Middleware for serving static files for conduit"
77
repository = "https://github.com/conduit-rust/conduit-static"
88
license = "MIT"
9+
edition = "2018"
910

1011
[dependencies]
1112
conduit = { version = "0.9.0-alpha.5", path = "../conduit" }

conduit-static/src/lib.rs

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1-
#![allow(trivial_casts)]
2-
#![warn(rust_2018_idioms)]
3-
#![cfg_attr(test, deny(warnings))]
4-
5-
extern crate conduit;
6-
extern crate conduit_mime_types as mime;
7-
extern crate filetime;
8-
#[cfg(test)]
9-
extern crate tempdir;
10-
extern crate time;
11-
121
use conduit::{box_error, header, Body, Handler, HandlerResult, RequestExt, Response, StatusCode};
2+
use conduit_mime_types as mime;
133
use filetime::FileTime;
144
use std::fs::File;
155
use std::path::{Path, PathBuf};
@@ -70,15 +60,13 @@ fn not_found() -> Response<Body> {
7060

7161
#[cfg(test)]
7262
mod tests {
73-
extern crate conduit_test;
74-
7563
use std::fs::{self, File};
7664
use std::io::prelude::*;
7765
use tempdir::TempDir;
7866

79-
use self::conduit_test::{MockRequest, ResponseExt};
67+
use crate::Static;
8068
use conduit::{header, Handler, Method, StatusCode};
81-
use Static;
69+
use conduit_test::{MockRequest, ResponseExt};
8270

8371
#[test]
8472
fn test_static() {

0 commit comments

Comments
 (0)