aboutsummaryrefslogtreecommitdiffstats
path: root/src/listing.rs
diff options
context:
space:
mode:
authorboastful-squirrel <boastful.squirrel@gmail.com>2019-04-26 18:08:16 +0000
committerboastful-squirrel <boastful.squirrel@gmail.com>2019-04-26 18:08:16 +0000
commit4a9711b71674c6b62512dd6286869690d4497bcc (patch)
treecd2d14e7635a96fdcf23d7a70f2b65bb78f515fe /src/listing.rs
parentMerged query parameter structs + improved file upload errors (diff)
downloadminiserve-4a9711b71674c6b62512dd6286869690d4497bcc.tar.gz
miniserve-4a9711b71674c6b62512dd6286869690d4497bcc.zip
Made ColorScheme, SortingMethod and SortingOrder enums derive Copy
Diffstat (limited to 'src/listing.rs')
-rw-r--r--src/listing.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/listing.rs b/src/listing.rs
index e718702..7cc125d 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -25,7 +25,7 @@ pub struct QueryParameters {
}
/// Available sorting methods
-#[derive(Deserialize, Clone, EnumString, Display)]
+#[derive(Deserialize, Clone, EnumString, Display, Copy)]
#[serde(rename_all = "snake_case")]
#[strum(serialize_all = "snake_case")]
pub enum SortingMethod {
@@ -40,7 +40,7 @@ pub enum SortingMethod {
}
/// Available sorting orders
-#[derive(Deserialize, Clone, EnumString, Display)]
+#[derive(Deserialize, Clone, EnumString, Display, Copy)]
pub enum SortingOrder {
/// Ascending order
#[serde(alias = "asc")]
@@ -146,10 +146,10 @@ pub fn directory_listing<S>(
let (sort_method, sort_order, download, color_scheme) =
if let Ok(query) = Query::<QueryParameters>::extract(req) {
(
- query.sort.clone(),
- query.order.clone(),
+ query.sort,
+ query.order,
query.download.clone(),
- query.theme.clone(),
+ query.theme,
)
} else {
(None, None, None, None)
@@ -211,7 +211,7 @@ pub fn directory_listing<S>(
}
}
- if let Some(sorting_method) = &sort_method {
+ if let Some(sorting_method) = sort_method {
match sorting_method {
SortingMethod::Name => entries
.sort_by(|e1, e2| alphanumeric_sort::compare_str(e1.name.clone(), e2.name.clone())),
@@ -235,13 +235,13 @@ pub fn directory_listing<S>(
entries.sort_by(|e1, e2| alphanumeric_sort::compare_str(e1.name.clone(), e2.name.clone()))
}
- if let Some(sorting_order) = &sort_order {
+ if let Some(sorting_order) = sort_order {
if let SortingOrder::Descending = sorting_order {
entries.reverse()
}
}
- let color_scheme = color_scheme.unwrap_or_else(|| default_color_scheme.clone());
+ let color_scheme = color_scheme.unwrap_or_else(|| default_color_scheme);
if let Some(compression_method) = &download {
log::info!(