From b6e51c9781585e6982e9ccb7992c87304ee2946a Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Mon, 30 Aug 2021 00:39:40 +0200 Subject: Fix some warnings when building without TLS --- src/config.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/config.rs b/src/config.rs index e2b4c3a..e47ffc1 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,11 +1,13 @@ +#[cfg(feature = "tls")] +use std::{fs::File, io::BufReader}; use std::{ - fs::File, - io::BufReader, net::{IpAddr, Ipv4Addr, Ipv6Addr}, path::PathBuf, }; -use anyhow::{anyhow, Context, Result}; +#[cfg(feature = "tls")] +use anyhow::anyhow; +use anyhow::{Context, Result}; use http::HeaderMap; #[cfg(feature = "tls")] -- cgit v1.2.3 From 51ddbd63e5ebc08f6f9a3f213220371a79c59fa2 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Mon, 30 Aug 2021 00:48:52 +0200 Subject: Fix stderr output in test index_fallback_to_listing --- tests/serve_request.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/serve_request.rs b/tests/serve_request.rs index 09a20d4..bbbb7d9 100644 --- a/tests/serve_request.rs +++ b/tests/serve_request.rs @@ -3,7 +3,8 @@ mod fixtures; use assert_cmd::prelude::*; use assert_fs::fixture::TempDir; use fixtures::{ - port, server, tmpdir, Error, TestServer, DIRECTORIES, FILES, HIDDEN_DIRECTORIES, HIDDEN_FILES, + port, server, server_no_stderr, tmpdir, Error, TestServer, DIRECTORIES, FILES, + HIDDEN_DIRECTORIES, HIDDEN_FILES, }; use http::StatusCode; use regex::Regex; @@ -222,8 +223,8 @@ fn serves_requests_custom_index_notice(tmpdir: TempDir, port: u16) -> Result<(), } #[rstest] -#[case(server(&["--index", FILES[0]]))] -#[case(server(&["--index", "does-not-exist.html"]))] +#[case(server_no_stderr(&["--index", FILES[0]]))] +#[case(server_no_stderr(&["--index", "does-not-exist.html"]))] fn index_fallback_to_listing(#[case] server: TestServer) -> Result<(), Error> { // If index file is not found, show directory listing instead. // both cases should return `Ok` -- cgit v1.2.3