update deps + msrv

Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT"
 name = "zoxide"
 readme = "README.md"
 repository = "https://github.com/ajeetdsouza/zoxide"
-rust-version = "1.85.0"
+rust-version = "1.88.0"
 version = "0.9.9"
 
 [badges]
@@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 anyhow = "1.0.32"
-askama = { version = "0.14.0", default-features = false, features = [
+askama = { version = "0.16.0", default-features = false, features = [
     "derive",
     "std",
 ] }
@@ -33,13 +33,13 @@ serde = { version = "1.0.116", features = ["derive"] }
 time = { version = "0.3.47", default-features = false, features = ["parsing", "macros", "std"] }
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.30.1", default-features = false, features = [
+nix = { version = "0.31.2", default-features = false, features = [
     "fs",
     "user",
 ] }
 
 [target.'cfg(windows)'.dependencies]
-which = "7.0.3"
+which = "8.0.2"
 
 [build-dependencies]
 clap = { version = "4.3.0", features = ["derive"] }

contrib/completions/_zoxide

@@ -45,7 +45,7 @@ _arguments "${_arguments_options[@]}" : \
 '--help[Print help]' \
 '-V[Print version]' \
 '--version[Print version]' \
-":: :_zoxide__edit_commands" \
+":: :_zoxide__subcmd__edit_commands" \
 "*::: :->edit" \
 && ret=0
 
@@ -101,7 +101,7 @@ _arguments "${_arguments_options[@]}" : \
 '--help[Print help]' \
 '-V[Print version]' \
 '--version[Print version]' \
-":: :_zoxide__import_commands" \
+":: :_zoxide__subcmd__import_commands" \
 "*::: :->import" \
 && ret=0
 
@@ -226,13 +226,13 @@ _zoxide_commands() {
     )
     _describe -t commands 'zoxide commands' commands "$@"
 }
-(( $+functions[_zoxide__add_commands] )) ||
+(( $+functions[_zoxide__subcmd__add_commands] )) ||
-_zoxide__add_commands() {
+_zoxide__subcmd__add_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide add commands' commands "$@"
 }
-(( $+functions[_zoxide__edit_commands] )) ||
+(( $+functions[_zoxide__subcmd__edit_commands] )) ||
-_zoxide__edit_commands() {
+_zoxide__subcmd__edit_commands() {
     local commands; commands=(
 'decrement:' \
 'delete:' \
@@ -241,28 +241,28 @@ _zoxide__edit_commands() {
     )
     _describe -t commands 'zoxide edit commands' commands "$@"
 }
-(( $+functions[_zoxide__edit__decrement_commands] )) ||
+(( $+functions[_zoxide__subcmd__edit__subcmd__decrement_commands] )) ||
-_zoxide__edit__decrement_commands() {
+_zoxide__subcmd__edit__subcmd__decrement_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide edit decrement commands' commands "$@"
 }
-(( $+functions[_zoxide__edit__delete_commands] )) ||
+(( $+functions[_zoxide__subcmd__edit__subcmd__delete_commands] )) ||
-_zoxide__edit__delete_commands() {
+_zoxide__subcmd__edit__subcmd__delete_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide edit delete commands' commands "$@"
 }
-(( $+functions[_zoxide__edit__increment_commands] )) ||
+(( $+functions[_zoxide__subcmd__edit__subcmd__increment_commands] )) ||
-_zoxide__edit__increment_commands() {
+_zoxide__subcmd__edit__subcmd__increment_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide edit increment commands' commands "$@"
 }
-(( $+functions[_zoxide__edit__reload_commands] )) ||
+(( $+functions[_zoxide__subcmd__edit__subcmd__reload_commands] )) ||
-_zoxide__edit__reload_commands() {
+_zoxide__subcmd__edit__subcmd__reload_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide edit reload commands' commands "$@"
 }
-(( $+functions[_zoxide__import_commands] )) ||
+(( $+functions[_zoxide__subcmd__import_commands] )) ||
-_zoxide__import_commands() {
+_zoxide__subcmd__import_commands() {
     local commands; commands=(
 'atuin:Import from atuin' \
 'autojump:Import from autojump' \
@@ -273,48 +273,48 @@ _zoxide__import_commands() {
     )
     _describe -t commands 'zoxide import commands' commands "$@"
 }
-(( $+functions[_zoxide__import__atuin_commands] )) ||
+(( $+functions[_zoxide__subcmd__import__subcmd__atuin_commands] )) ||
-_zoxide__import__atuin_commands() {
+_zoxide__subcmd__import__subcmd__atuin_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide import atuin commands' commands "$@"
 }
-(( $+functions[_zoxide__import__autojump_commands] )) ||
+(( $+functions[_zoxide__subcmd__import__subcmd__autojump_commands] )) ||
-_zoxide__import__autojump_commands() {
+_zoxide__subcmd__import__subcmd__autojump_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide import autojump commands' commands "$@"
 }
-(( $+functions[_zoxide__import__fasd_commands] )) ||
+(( $+functions[_zoxide__subcmd__import__subcmd__fasd_commands] )) ||
-_zoxide__import__fasd_commands() {
+_zoxide__subcmd__import__subcmd__fasd_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide import fasd commands' commands "$@"
 }
-(( $+functions[_zoxide__import__z_commands] )) ||
+(( $+functions[_zoxide__subcmd__import__subcmd__z_commands] )) ||
-_zoxide__import__z_commands() {
+_zoxide__subcmd__import__subcmd__z_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide import z commands' commands "$@"
 }
-(( $+functions[_zoxide__import__z.lua_commands] )) ||
+(( $+functions[_zoxide__subcmd__import__subcmd__z.lua_commands] )) ||
-_zoxide__import__z.lua_commands() {
+_zoxide__subcmd__import__subcmd__z.lua_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide import z.lua commands' commands "$@"
 }
-(( $+functions[_zoxide__import__zsh-z_commands] )) ||
+(( $+functions[_zoxide__subcmd__import__subcmd__zsh-z_commands] )) ||
-_zoxide__import__zsh-z_commands() {
+_zoxide__subcmd__import__subcmd__zsh-z_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide import zsh-z commands' commands "$@"
 }
-(( $+functions[_zoxide__init_commands] )) ||
+(( $+functions[_zoxide__subcmd__init_commands] )) ||
-_zoxide__init_commands() {
+_zoxide__subcmd__init_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide init commands' commands "$@"
 }
-(( $+functions[_zoxide__query_commands] )) ||
+(( $+functions[_zoxide__subcmd__query_commands] )) ||
-_zoxide__query_commands() {
+_zoxide__subcmd__query_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide query commands' commands "$@"
 }
-(( $+functions[_zoxide__remove_commands] )) ||
+(( $+functions[_zoxide__subcmd__remove_commands] )) ||
-_zoxide__remove_commands() {
+_zoxide__subcmd__remove_commands() {
     local commands; commands=()
     _describe -t commands 'zoxide remove commands' commands "$@"
 }

contrib/completions/zoxide.bash

@@ -17,52 +17,52 @@ _zoxide() {
                 cmd="zoxide"
                 ;;
             zoxide,add)
-                cmd="zoxide__add"
+                cmd="zoxide__subcmd__add"
                 ;;
             zoxide,edit)
-                cmd="zoxide__edit"
+                cmd="zoxide__subcmd__edit"
                 ;;
             zoxide,import)
-                cmd="zoxide__import"
+                cmd="zoxide__subcmd__import"
                 ;;
             zoxide,init)
-                cmd="zoxide__init"
+                cmd="zoxide__subcmd__init"
                 ;;
             zoxide,query)
-                cmd="zoxide__query"
+                cmd="zoxide__subcmd__query"
                 ;;
             zoxide,remove)
-                cmd="zoxide__remove"
+                cmd="zoxide__subcmd__remove"
                 ;;
-            zoxide__edit,decrement)
+            zoxide__subcmd__edit,decrement)
-                cmd="zoxide__edit__decrement"
+                cmd="zoxide__subcmd__edit__subcmd__decrement"
                 ;;
-            zoxide__edit,delete)
+            zoxide__subcmd__edit,delete)
-                cmd="zoxide__edit__delete"
+                cmd="zoxide__subcmd__edit__subcmd__delete"
                 ;;
-            zoxide__edit,increment)
+            zoxide__subcmd__edit,increment)
-                cmd="zoxide__edit__increment"
+                cmd="zoxide__subcmd__edit__subcmd__increment"
                 ;;
-            zoxide__edit,reload)
+            zoxide__subcmd__edit,reload)
-                cmd="zoxide__edit__reload"
+                cmd="zoxide__subcmd__edit__subcmd__reload"
                 ;;
-            zoxide__import,atuin)
+            zoxide__subcmd__import,atuin)
-                cmd="zoxide__import__atuin"
+                cmd="zoxide__subcmd__import__subcmd__atuin"
                 ;;
-            zoxide__import,autojump)
+            zoxide__subcmd__import,autojump)
-                cmd="zoxide__import__autojump"
+                cmd="zoxide__subcmd__import__subcmd__autojump"
                 ;;
-            zoxide__import,fasd)
+            zoxide__subcmd__import,fasd)
-                cmd="zoxide__import__fasd"
+                cmd="zoxide__subcmd__import__subcmd__fasd"
                 ;;
-            zoxide__import,z)
+            zoxide__subcmd__import,z)
-                cmd="zoxide__import__z"
+                cmd="zoxide__subcmd__import__subcmd__z"
                 ;;
-            zoxide__import,z.lua)
+            zoxide__subcmd__import,z.lua)
-                cmd="zoxide__import__z.lua"
+                cmd="zoxide__subcmd__import__subcmd__z.lua"
                 ;;
-            zoxide__import,zsh-z)
+            zoxide__subcmd__import,zsh-z)
-                cmd="zoxide__import__zsh__z"
+                cmd="zoxide__subcmd__import__subcmd__zsh__subcmd__z"
                 ;;
             *)
                 ;;
@@ -84,7 +84,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__add)
+        zoxide__subcmd__add)
             opts="-s -h -V --score --help --version <PATHS>..."
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -106,7 +106,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__edit)
+        zoxide__subcmd__edit)
             opts="-h -V --help --version decrement delete increment reload"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -120,7 +120,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__edit__decrement)
+        zoxide__subcmd__edit__subcmd__decrement)
             opts="-h -V --help --version <PATH>"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -134,7 +134,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__edit__delete)
+        zoxide__subcmd__edit__subcmd__delete)
             opts="-h -V --help --version <PATH>"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -148,7 +148,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__edit__increment)
+        zoxide__subcmd__edit__subcmd__increment)
             opts="-h -V --help --version <PATH>"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -162,7 +162,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__edit__reload)
+        zoxide__subcmd__edit__subcmd__reload)
             opts="-h -V --help --version"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -176,7 +176,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__import)
+        zoxide__subcmd__import)
             opts="-h -V --merge --help --version atuin autojump fasd z z.lua zsh-z"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -190,7 +190,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__import__atuin)
+        zoxide__subcmd__import__subcmd__atuin)
             opts="-h -V --merge --help --version"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -204,7 +204,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__import__autojump)
+        zoxide__subcmd__import__subcmd__autojump)
             opts="-h -V --merge --help --version"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -218,7 +218,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__import__fasd)
+        zoxide__subcmd__import__subcmd__fasd)
             opts="-h -V --merge --help --version"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -232,7 +232,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__import__z)
+        zoxide__subcmd__import__subcmd__z)
             opts="-h -V --merge --help --version"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -246,7 +246,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__import__z.lua)
+        zoxide__subcmd__import__subcmd__z.lua)
             opts="-h -V --merge --help --version"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -260,7 +260,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__import__zsh__z)
+        zoxide__subcmd__import__subcmd__zsh__subcmd__z)
             opts="-h -V --merge --help --version"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -274,7 +274,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__init)
+        zoxide__subcmd__init)
             opts="-h -V --no-cmd --cmd --hook --help --version bash elvish fish nushell posix powershell tcsh xonsh zsh"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -296,7 +296,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__query)
+        zoxide__subcmd__query)
             opts="-a -i -l -s -h -V --all --interactive --list --score --exclude --base-dir --help --version [KEYWORDS]..."
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
@@ -324,7 +324,7 @@ _zoxide() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
-        zoxide__remove)
+        zoxide__subcmd__remove)
             opts="-h -V --help --version [PATHS]..."
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )

contrib/completions/zoxide.nu

@@ -8,10 +8,10 @@ module completions {
 
   # Add a new directory or increment its rank
   export extern "zoxide add" [
-    ...paths: path
     --score(-s): string       # The rank to increment the entry if it exists or initialize it with if it doesn't
     --help(-h)                # Print help
     --version(-V)             # Print version
+    ...paths: path
   ]
 
   # Edit the database
@@ -21,21 +21,21 @@ module completions {
   ]
 
   export extern "zoxide edit decrement" [
-    path: string
     --help(-h)                # Print help
     --version(-V)             # Print version
+    path: string
   ]
 
   export extern "zoxide edit delete" [
-    path: string
     --help(-h)                # Print help
     --version(-V)             # Print version
+    path: string
   ]
 
   export extern "zoxide edit increment" [
-    path: string
     --help(-h)                # Print help
     --version(-V)             # Print version
+    path: string
   ]
 
   export extern "zoxide edit reload" [
@@ -102,17 +102,16 @@ module completions {
 
   # Generate shell configuration
   export extern "zoxide init" [
-    shell: string@"nu-complete zoxide init shell"
     --no-cmd                  # Prevents zoxide from defining the `z` and `zi` commands
     --cmd: string             # Changes the prefix of the `z` and `zi` commands
     --hook: string@"nu-complete zoxide init hook" # Changes how often zoxide increments a directory's score
     --help(-h)                # Print help
     --version(-V)             # Print version
+    shell: string@"nu-complete zoxide init shell"
   ]
 
   # Search for a directory in the database
   export extern "zoxide query" [
-    ...keywords: string
     --all(-a)                 # Show unavailable directories
     --interactive(-i)         # Use interactive selection
     --list(-l)                # List all matching directories
@@ -121,13 +120,14 @@ module completions {
     --base-dir: path          # Only search within this directory
     --help(-h)                # Print help
     --version(-V)             # Print version
+    ...keywords: string
   ]
 
   # Remove a directory from the database
   export extern "zoxide remove" [
-    ...paths: path
     --help(-h)                # Print help
     --version(-V)             # Print version
+    ...paths: path
   ]
 
 }

templates/bash.txt

@@ -9,7 +9,7 @@
 
 # pwd based on the value of _ZO_RESOLVE_SYMLINKS.
 function __zoxide_pwd() {
-{%- let pwd -%}
+{%- decl pwd -%}
 {%- if resolve_symlinks -%}
 {%- let pwd = "\\builtin pwd -P" -%}
 {%- else -%}

templates/fish.txt

@@ -7,7 +7,7 @@
 
 # pwd based on the value of _ZO_RESOLVE_SYMLINKS.
 function __zoxide_pwd
-{%- let pwd -%}
+{%- decl pwd -%}
 {%- if resolve_symlinks -%}
 {%- let pwd = "builtin pwd -P" -%}
 {%- else -%}

templates/posix.txt

@@ -8,7 +8,7 @@
 #
 
 # pwd based on the value of _ZO_RESOLVE_SYMLINKS.
-{%- let pwd -%}
+{%- decl pwd -%}
 {%- if resolve_symlinks -%}
 {%- let pwd = "\\command pwd -P" -%}
 {%- else -%}

templates/tcsh.txt

@@ -1,7 +1,7 @@
 {%- let section = "# =============================================================================\n#" -%}
 {%- let not_configured = "# -- not configured --" -%}
 
-{%- let pwd_cmd -%}
+{%- decl pwd_cmd -%}
 {%- if resolve_symlinks -%}
 {%- let pwd_cmd = "pwd -P" -%}
 {%- else -%}

templates/zsh.txt

@@ -9,7 +9,7 @@
 
 # pwd based on the value of _ZO_RESOLVE_SYMLINKS.
 function __zoxide_pwd() {
-{%- let pwd -%}
+{%- decl pwd -%}
 {%- if resolve_symlinks -%}
 {%- let pwd = "\\builtin pwd -P" -%}
 {%- else -%}