.github/workflows/build.yml

@@ -49,17 +49,17 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Cache cargo registry
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.cargo/registry
           key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo index
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo build
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: target
           key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

.github/workflows/release.yml

@@ -13,17 +13,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache cargo registry
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.cargo/registry
           key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo index
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo build
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: target
           key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
@@ -57,17 +57,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache cargo registry
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.cargo/registry
           key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo index
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo build
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: target
           key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
@@ -90,17 +90,17 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Cache cargo registry
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.cargo/registry
           key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo index
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo build
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: target
           key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

CHANGELOG.md

@@ -1,8 +1,3 @@
-## v0.1.15
-
-- Update `alphanumeric-sort` dependency so `cargo install phd` works again.
-- Recommend `cargo install phd --locked` in the README
-
 ## v0.1.14
 
 - If the `NO_COLOR` env variable is set, colors won't be printed to

Cargo.lock

@@ -1,12 +1,10 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "alphanumeric-sort"
-version = "1.4.4"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e9c9abb82613923ec78d7a461595d52491ba7240f3c64c0bbe0e6d98e0fce0"
+checksum = "f37ce94154d73f6961f87571a3ab7814e1608f373bd55a933e3e771b6dd59fc4"
 
 [[package]]
 name = "content_inspector"
@@ -50,7 +48,7 @@ dependencies = [
 
 [[package]]
 name = "phd"
-version = "0.1.15"
+version = "0.1.14"
 dependencies = [
  "alphanumeric-sort",
  "content_inspector",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "phd"
-version = "0.1.15"
+version = "0.1.14"
 authors = ["chris west <c@xvxx.io>"]
 license = "MIT"
 edition = "2018"
@@ -24,9 +24,10 @@ pre-release-replacements = [
   {file="README.md", search="/v\\d+\\.\\d+\\.\\d+/", replace="/v{{version}}/"},
   {file="CHANGELOG.md", search="\\d+\\.\\d+\\.\\d+-dev", replace="{{version}}"},
 ]
+dev-version-ext = "dev"
 
 [dependencies]
 content_inspector = "0.2.4"
 threadpool = "1.7.1"
-alphanumeric-sort = "1.4"
+alphanumeric-sort = "1.0.11"
 shell-escape = "0.1.4"

README.md

@@ -166,15 +166,15 @@ On macOS you can install with [Homebrew](https://brew.sh/):
 Binaries for Linux, Mac, and Raspberry Pi are available at
 gopher://phkt.io/1/releases/phd and https://github.com/xvxx/phd/releases:
 
-- [phd-v0.1.15-linux-x86_64.tar.gz][0]
-- [phd-v0.1.15-linux-armv7.tar.gz (Raspberry Pi)][1]
-- [phd-v0.1.15-macos.zip][2]
+- [phd-v0.1.14-linux-x86_64.tar.gz][0]
+- [phd-v0.1.14-linux-armv7.tar.gz (Raspberry Pi)][1]
+- [phd-v0.1.14-macos.zip][2]
 
 Just unzip/untar the `phd` program into your `$PATH` and get going!
 
 If you have **[cargo][rustup]**, you can install the crate directly:
 
-    cargo install phd --locked
+    cargo install phd
 
 ## ~ development ~
 
@@ -193,13 +193,9 @@ If you have **[cargo][rustup]**, you can install the crate directly:
 - [ ] TLS support
 - [ ] user input sanitization tests
 
-## ~ status ~
-
-phd is no longer under active development, but the latest version works great.
-
-[0]: https://github.com/xvxx/phd/releases/download/v0.1.15/phd-v0.1.15-linux-x86_64.tar.gz
-[1]: https://github.com/xvxx/phd/releases/download/v0.1.15/phd-v0.1.15-linux-armv7.tar.gz
-[2]: https://github.com/xvxx/phd/releases/download/v0.1.15/phd-v0.1.15-macos.zip
+[0]: https://github.com/xvxx/phd/releases/download/v0.1.14/phd-v0.1.14-linux-x86_64.tar.gz
+[1]: https://github.com/xvxx/phd/releases/download/v0.1.14/phd-v0.1.14-linux-armv7.tar.gz
+[2]: https://github.com/xvxx/phd/releases/download/v0.1.14/phd-v0.1.14-macos.zip
 [map]: https://en.wikipedia.org/wiki/Gopher_(protocol)#Source_code_of_a_menu
 [gmi]: http://r-36.net/scm/geomyidae/
 [rustup]: https://rustup.rs

src/server.rs

@@ -410,10 +410,7 @@ fn sort_paths(dir_path: &str, reverse: bool) -> Result<Vec<DirEntry>> {
         let a_is_dir = is_dir(a);
         let b_is_dir = is_dir(b);
         if a_is_dir && b_is_dir || !a_is_dir && !b_is_dir {
-            let ord = alphanumeric_sort::compare_os_str::<&Path, &Path>(
-                a.path().as_ref(),
-                b.path().as_ref(),
-            );
+            let ord = alphanumeric_sort::compare_os_str(a.path().as_ref(), b.path().as_ref());
             if reverse {
                 ord.reverse()
             } else {