From d2b97240109b0f09e55900ad645c3cf6d5102956 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sat, 18 Dec 2021 03:27:32 +0000
Subject: [PATCH] update bump script to detect prerelease versions

---
 scripts/bump | 14 ++++++++++++--
 src/app.rs   | 18 ++++++++++--------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/scripts/bump b/scripts/bump
index 0c360569..43cd8b8c 100755
--- a/scripts/bump
+++ b/scripts/bump
@@ -55,6 +55,11 @@ else
     read -p "Update version to: " NEW_VERSION
 fi
 
+# strip leading v from input
+if [ "${NEW_VERSION:0:1}" = "v" ]; then
+    NEW_VERSION="${NEW_VERSION:1}"
+fi
+
 DATE="$(date -u +"%Y-%m-%d")"
 echo "updating from $CURRENT_VERSION => $NEW_VERSION ($DATE)"
 
@@ -124,15 +129,20 @@ SHORT_PACKAGE_NAME="$(echo $PACKAGE_NAME | sed 's/^actix-web-//' | sed 's/^actix
 GIT_TAG="$(echo $SHORT_PACKAGE_NAME-v$NEW_VERSION)"
 RELEASE_TITLE="$(echo $PACKAGE_NAME: v$NEW_VERSION)"
 
+if [ "$(echo $NEW_VERSION | grep beta)" ] || [ "$(echo $NEW_VERSION | grep rc)" ] || [ "$(echo $NEW_VERSION | grep alpha)" ]; then
+    PRERELEASE="--prerelease"
+fi
+
 echo
 echo "GitHub release command:"
-echo "gh release create \"$GIT_TAG\" --draft --title \"$RELEASE_TITLE\" --notes-file \"$CHANGE_CHUNK_FILE\" --prerelease"
+GH_CMD="gh release create \"$GIT_TAG\" --draft --title \"$RELEASE_TITLE\" --notes-file \"$CHANGE_CHUNK_FILE\" ${PRERELEASE:-}"
+echo "$GH_CMD"
 
 read -p "Submit draft GH release: (y/N) " GH_RELEASE
 GH_RELEASE="${GH_RELEASE:-n}"
 
 if [ "$GH_RELEASE" = 'y' ] || [ "$GH_RELEASE" = 'Y' ]; then
-    gh release create "$GIT_TAG" --draft --title "$RELEASE_TITLE" --notes-file "$CHANGE_CHUNK_FILE" --prerelease
+    eval "$GH_CMD"
 fi
 
 echo
diff --git a/src/app.rs b/src/app.rs
index feb35d7a..6bccc1ff 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -486,19 +486,21 @@ where
 
 #[cfg(test)]
 mod tests {
-    use actix_service::Service;
+    use actix_service::Service as _;
     use actix_utils::future::{err, ok};
     use bytes::Bytes;
 
     use super::*;
-    use crate::http::{
-        header::{self, HeaderValue},
-        Method, StatusCode,
+    use crate::{
+        http::{
+            header::{self, HeaderValue},
+            Method, StatusCode,
+        },
+        middleware::DefaultHeaders,
+        service::ServiceRequest,
+        test::{call_service, init_service, read_body, try_init_service, TestRequest},
+        web, HttpRequest, HttpResponse,
     };
-    use crate::middleware::DefaultHeaders;
-    use crate::service::ServiceRequest;
-    use crate::test::{call_service, init_service, read_body, try_init_service, TestRequest};
-    use crate::{web, HttpRequest, HttpResponse};
 
     #[actix_rt::test]
     async fn test_default_resource() {