Reorganize imports to be more consistent

Author: svenstaro

tests/archive.rs

@@ -1,10 +1,10 @@
-mod fixtures;
-
-use fixtures::{server, Error, TestServer};
-use reqwest::StatusCode;
+use reqwest::StatusCode;
 use rstest::rstest;
-use select::document::Document;
-use select::predicate::Text;
+use select::{document::Document, predicate::Text};
+
+mod fixtures;
+
+use crate::fixtures::{server, Error, TestServer};
 
 #[rstest]
 fn archives_are_disabled(server: TestServer) -> Result<(), Error> {

tests/auth.rs

@@ -1,12 +1,11 @@
-mod fixtures;
-
-use fixtures::{server, server_no_stderr, Error, FILES};
 use pretty_assertions::assert_eq;
-use reqwest::blocking::Client;
-use reqwest::StatusCode;
+use reqwest::{blocking::Client, StatusCode};
 use rstest::rstest;
-use select::document::Document;
-use select::predicate::Text;
+use select::{document::Document, predicate::Text};
+
+mod fixtures;
+
+use crate::fixtures::{server, server_no_stderr, Error, FILES};
 
 #[rstest(
     cli_auth_arg, client_username, client_password,

tests/auth_file.rs

@@ -1,11 +1,10 @@
+use reqwest::{blocking::Client, StatusCode};
+use rstest::rstest;
+use select::{document::Document, predicate::Text};
+
 mod fixtures;
 
-use fixtures::{server, server_no_stderr, Error, FILES};
-use reqwest::blocking::Client;
-use reqwest::StatusCode;
-use rstest::rstest;
-use select::document::Document;
-use select::predicate::Text;
+use crate::fixtures::{server, server_no_stderr, Error, FILES};
 
 #[rstest(
     cli_auth_file_arg,

tests/bind.rs

@@ -1,12 +1,14 @@
-mod fixtures;
+use std::io::{BufRead, BufReader};
+use std::process::{Command, Stdio};
 
 use assert_cmd::prelude::*;
 use assert_fs::fixture::TempDir;
-use fixtures::{port, server, tmpdir, Error, TestServer};
 use regex::Regex;
 use rstest::rstest;
-use std::io::{BufRead, BufReader};
-use std::process::{Command, Stdio};
+
+mod fixtures;
+
+use crate::fixtures::{port, server, tmpdir, Error, TestServer};
 
 #[rstest]
 #[case(&["-i", "12.123.234.12"])]

tests/cli.rs

@@ -1,10 +1,12 @@
-mod fixtures;
+use std::process::Command;
 
 use assert_cmd::prelude::*;
 use clap::{crate_name, crate_version, ValueEnum};
 use clap_complete::Shell;
-use fixtures::Error;
-use std::process::Command;
+
+mod fixtures;
+
+use crate::fixtures::Error;
 
 #[test]
 /// Show help and exit.

tests/create_directories.rs

@@ -1,15 +1,19 @@
-mod fixtures;
-
-use fixtures::{server, Error, TestServer, DIRECTORIES};
-use reqwest::blocking::{multipart, Client};
-use rstest::rstest;
-use select::document::Document;
-use select::predicate::{Attr, Text};
 #[cfg(unix)]
 use std::os::unix::fs::symlink as symlink_dir;
 #[cfg(windows)]
 use std::os::windows::fs::symlink_dir;
 
+use reqwest::blocking::{multipart, Client};
+use rstest::rstest;
+use select::{
+    document::Document,
+    predicate::{Attr, Text},
+};
+
+mod fixtures;
+
+use crate::fixtures::{server, Error, TestServer, DIRECTORIES};
+
 /// This should work because the flags for uploading files and creating directories
 /// are set, and the directory name and path are valid.
 #[rstest]

tests/header.rs

@@ -1,7 +1,8 @@
+use rstest::rstest;
+
 mod fixtures;
 
-use fixtures::{server, Error};
-use rstest::rstest;
+use crate::fixtures::{server, Error};
 
 #[rstest(headers,
     case(vec!["x-info: 123".to_string()]),

tests/navigation.rs

@@ -1,13 +1,14 @@
-mod fixtures;
-mod utils;
+use std::process::{Command, Stdio};
 
-use fixtures::{server, Error, TestServer, DEEPLY_NESTED_FILE, DIRECTORIES};
 use pretty_assertions::{assert_eq, assert_ne};
 use rstest::rstest;
 use select::document::Document;
-use std::process::{Command, Stdio};
-use utils::get_link_from_text;
-use utils::get_link_hrefs_with_prefix;
+
+mod fixtures;
+mod utils;
+
+use crate::fixtures::{server, Error, TestServer, DEEPLY_NESTED_FILE, DIRECTORIES};
+use crate::utils::{get_link_from_text, get_link_hrefs_with_prefix};
 
 #[rstest(
     input,

tests/qrcode.rs

@@ -1,14 +1,15 @@
-mod fixtures;
+use std::process::{Command, Stdio};
+use std::thread::sleep;
+use std::time::Duration;
 
 use assert_cmd::prelude::CommandCargoExt;
 use assert_fs::TempDir;
-use fixtures::{port, server, tmpdir, Error, TestServer};
 use rstest::rstest;
-use select::document::Document;
-use select::predicate::Attr;
-use std::process::{Command, Stdio};
-use std::thread::sleep;
-use std::time::Duration;
+use select::{document::Document, predicate::Attr};
+
+mod fixtures;
+
+use crate::fixtures::{port, server, tmpdir, Error, TestServer};
 
 #[rstest]
 fn webpage_hides_qrcode_when_disabled(server: TestServer) -> Result<(), Error> {

tests/raw.rs

@@ -1,14 +1,14 @@
-mod fixtures;
-mod utils;
-
-use crate::fixtures::TestServer;
-use fixtures::{server, Error};
 use pretty_assertions::assert_eq;
 use reqwest::blocking::Client;
 use rstest::rstest;
-use select::document::Document;
-use select::predicate::Class;
-use select::predicate::Name;
+use select::{
+    document::Document,
+    predicate::{Class, Name},
+};
+
+mod fixtures;
+
+use crate::fixtures::{server, Error, TestServer};
 
 /// The footer displays the correct wget command to download the folder recursively
 // This test can't test all aspects of the wget footer,

tests/readme.rs

@@ -1,12 +1,14 @@
-mod fixtures;
+use std::fs::{remove_file, File};
+use std::io::Write;
+use std::path::PathBuf;
 
-use fixtures::{server, Error, TestServer, DIRECTORIES, FILES};
 use rstest::rstest;
 use select::predicate::Attr;
 use select::{document::Document, node::Node};
-use std::fs::{remove_file, File};
-use std::io::Write;
-use std::path::PathBuf;
+
+mod fixtures;
+
+use fixtures::{server, Error, TestServer, DIRECTORIES, FILES};
 
 fn write_readme_contents(path: PathBuf, filename: &str) -> PathBuf {
     let readme_path = path.join(filename);

tests/serve_request.rs

@@ -1,18 +1,20 @@
-mod fixtures;
+use std::process::{Command, Stdio};
+use std::thread::sleep;
+use std::time::Duration;
 
 use assert_cmd::prelude::*;
 use assert_fs::fixture::TempDir;
-use fixtures::{
-    port, server, server_no_stderr, tmpdir, Error, TestServer, DIRECTORIES, FILES,
-    HIDDEN_DIRECTORIES, HIDDEN_FILES,
-};
 use regex::Regex;
 use reqwest::StatusCode;
 use rstest::rstest;
 use select::{document::Document, node::Node, predicate::Attr};
-use std::process::{Command, Stdio};
-use std::thread::sleep;
-use std::time::Duration;
+
+mod fixtures;
+
+use crate::fixtures::{
+    port, server, server_no_stderr, tmpdir, Error, TestServer, DIRECTORIES, FILES,
+    HIDDEN_DIRECTORIES, HIDDEN_FILES,
+};
 
 #[cfg(unix)]
 use std::os::unix::fs::{symlink as symlink_dir, symlink as symlink_file};

tests/tls.rs

@@ -1,12 +1,13 @@
-mod fixtures;
-
 use assert_cmd::Command;
-use fixtures::{server, Error, TestServer, FILES};
 use predicates::str::contains;
 use reqwest::blocking::ClientBuilder;
 use rstest::rstest;
 use select::{document::Document, node::Node};
 
+mod fixtures;
+
+use crate::fixtures::{server, Error, TestServer, FILES};
+
 /// Can start the server with TLS and receive encrypted responses.
 #[rstest]
 #[case(server(&[

tests/upload_files.rs

@@ -1,13 +1,15 @@
-mod fixtures;
+use std::fs::create_dir_all;
+use std::path::Path;
 
 use assert_fs::fixture::TempDir;
-use fixtures::{server, server_no_stderr, tmpdir, Error, TestServer};
 use reqwest::blocking::{multipart, Client};
 use rstest::rstest;
 use select::document::Document;
 use select::predicate::{Attr, Text};
-use std::fs::create_dir_all;
-use std::path::Path;
+
+mod fixtures;
+
+use crate::fixtures::{server, server_no_stderr, tmpdir, Error, TestServer};
 
 #[rstest]
 fn uploading_files_works(#[with(&["-u"])] server: TestServer) -> Result<(), Error> {

tests/utils/mod.rs

@@ -4,7 +4,6 @@ use select::predicate::Name;
 use select::predicate::Predicate;
 
 /// Return the href attribute content for the closest anchor found by `text`.
-#[allow(dead_code)]
 pub fn get_link_from_text(document: &Document, text: &str) -> Option<String> {
     let a_elem = document
         .find(Name("a").and(|x: &Node| x.children().any(|x| x.text() == text)))
@@ -13,7 +12,6 @@ pub fn get_link_from_text(document: &Document, text: &str) -> Option<String> {
 }
 
 /// Return the href attributes of all links that start with the specified `prefix`.
-#[allow(dead_code)]
 pub fn get_link_hrefs_with_prefix(document: &Document, prefix: &str) -> Vec<String> {
     let mut vec: Vec<String> = Vec::new();