diff options
| author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2021-08-29 23:16:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-29 23:16:20 +0000 |
| commit | 6c7519292f029506947cfcd8d7eb3961b9657650 (patch) | |
| tree | d10c65b3d8c7e1c8699c7542f53708bbb785c422 | |
| parent | Merge pull request #585 from svenstaro/upload-artifact (diff) | |
| parent | Fix stderr output in test index_fallback_to_listing (diff) | |
| download | miniserve-6c7519292f029506947cfcd8d7eb3961b9657650.tar.gz miniserve-6c7519292f029506947cfcd8d7eb3961b9657650.zip | |
Merge pull request #586 from svenstaro/fix-warnings
Fix some warnings when building without TLS
| -rw-r--r-- | src/config.rs | 8 | ||||
| -rw-r--r-- | tests/serve_request.rs | 7 |
2 files changed, 9 insertions, 6 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")] 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` |