Compare commits

..

No commits in common. "31b4bde4ae65abcbee67422afe4f20e47ff12dc8" and "628272dbba090035ea97f1529cce5b6ad8e220ce" have entirely different histories.

7 changed files with 1296 additions and 29 deletions

215
zsh/completions/_rust Normal file
View file

@ -0,0 +1,215 @@
#compdef rustc
local -a _rustc_opts_switches _rustc_opts_lint _rustc_opts_debug
typeset -A opt_args
_rustc_debuginfo_levels=(
"0[no debug info]"
"1[line-tables only (for stacktraces and breakpoints)]"
"2[full debug info with variable and type information (same as -g)]"
)
_rustc_crate_types=(
'bin'
'lib'
'rlib'
'dylib'
'staticlib'
)
_rustc_emit_types=(
'asm'
'llvm-bc'
'llvm-ir'
'obj'
'link'
'dep-info'
)
_rustc_pretty_types=(
'normal[un-annotated source]'
'expanded[crates expanded]'
'typed[crates expanded, with type annotations]'
'identified[fully parenthesized, AST nodes and blocks with IDs]'
'flowgraph[graphviz formatted flowgraph for node]:NODEID:'
)
_rustc_color_types=(
'auto[colorize, if output goes to a tty (default)]'
'always[always colorize output]'
'never[never colorize output]'
)
_rustc_info_types=(
'crate-name[Output the crate name and exit]'
'file-names[Output the file(s) that would be written if compilation continued and exited]'
'sysroot[Output the sysroot and exit]'
)
_rustc_opts_vals=(
--crate-name='[Specify the name of the crate being built]'
--crate-type='[Comma separated list of types of crates for the compiler to emit]:TYPES:_values -s "," "Crate types" "$_rustc_crate_types[@]"'
--emit='[Comma separated list of types of output for the compiler to emit]:TYPES:_values -s "," "Emit Targets" "$_rustc_emit_types[@]"'
--cfg='[Configure the compilation environment]:SPEC:'
--out-dir='[Write output to compiler-chosen filename in <dir>. Ignored if -o is specified. (default the current directory)]:DIR:_files -/'
-o'[Write output to <filename>. Ignored if more than one --emit is specified.]:FILENAME:_files'
--pretty='[Pretty-print the input instead of compiling]::TYPE:_values "TYPES" "$_rustc_pretty_types[@]"'
-L'[Add a directory to the library search path]:DIR:_files -/'
--target='[Target triple cpu-manufacturer-kernel\[-os\] to compile]:TRIPLE:'
--color='[Configure coloring of output]:CONF:_values "COLORS" "$_rustc_color_types[@]"'
{-v,--version}'[Print version info and exit]::VERBOSE:(verbose)'
--explain='[Provide a detailed explanation of an error message]:OPT:'
--extern'[Specify where an external rust library is located]:ARG:'
--print='[Comma separated list of compiler information to print on stdout]:TYPES:_values -s "," "Compiler Information" "$_rustc_info_types[@]"'
)
_rustc_opts_switches=(
-g'[Equivalent to -C debuginfo=2]'
{-h,--help}'[Display the help message]'
{-V,--verbose}'[use verbose output]'
-O'[Equivalent to -C opt-level=2]'
--test'[Build a test harness]'
)
_rustc_opts_link=(
'static[Path to the library to link statically]:PATH:_files -/'
'dylib[Path to the library to link dynamically]:PATH:_files -/'
'framework[Path to the library to link as a framework]:PATH:_files -/'
)
_rustc_opts_codegen=(
'ar[Path to the archive utility to use when assembling archives.]:BIN:_path_files'
'linker[Path to the linker utility to use when linking libraries, executables, and objects.]:BIN:_path_files'
'link-args[A space-separated list of extra arguments to pass to the linker when the linker is invoked.]:ARGS:'
'lto[Perform LLVM link-time optimizations]'
'target-cpu[Selects a target processor. If the value is "help", then a list of available CPUs is printed.]:CPU:'
'target-feature[A space-separated list of features to enable or disable for the target. A preceding "+" enables a feature while a preceding "-" disables it. Available features can be discovered through target-cpu=help.]:FEATURE:'
'passes[A space-separated list of extra LLVM passes to run. A value of "list" will cause rustc to print all known passes and exit. The passes specified are appended at the end of the normal pass manager.]:LIST:'
'llvm-args[A space-separated list of arguments to pass through to LLVM.]:ARGS:'
'save-temps[If specified, the compiler will save more files (.bc, .o, .no-opt.bc) generated throughout compilation in the output directory.]'
'rpath[If specified, then the rpath value for dynamic libraries will be set in either dynamic library or executable outputs.]'
'no-prepopulate-passes[Suppresses pre-population of the LLVM pass manager that is run over the module.]'
'no-vectorize-loops[Suppresses running the loop vectorization LLVM pass, regardless of optimization level.]'
'no-vectorize-slp[Suppresses running the LLVM SLP vectorization pass, regardless of optimization level.]'
'soft-float[Generates software floating point library calls instead of hardware instructions.]'
'prefer-dynamic[Prefers dynamic linking to static linking.]'
"no-integrated-as[Force usage of an external assembler rather than LLVM's integrated one.]"
'no-redzone[disable the use of the redzone]'
'relocation-model[The relocation model to use. (default: pic)]:MODEL:(pic static dynamic-no-pic)'
'code-model[choose the code model to use (llc -code-model for details)]:MODEL:'
'metadata[metadata to mangle symbol names with]:VAL:'
'extra-filenames[extra data to put in each output filename]:VAL:'
'codegen-units[divide crate into N units to optimize in parallel]:N:'
'remark[print remarks for these optimization passes (space separated, or "all")]:TYPE:'
'debuginfo[debug info emission level, 0 = no debug info, 1 = line tables only, 2 = full debug info with variable and type information]:LEVEL:_values "Debug Levels" "$_rustc_debuginfo_levels[@]"'
'opt-level[Optimize with possible levels 0-3]:LEVEL:(0 1 2 3)'
'help[Show all codegen options]'
)
_rustc_opts_lint=(
'help[Show a list of all lints]'
'box-pointers[(default: allow) use of owned (Box type) heap memory]'
'experimental[(default: allow) detects use of #\[experimental\] items]'
'fat-ptr-transmutes[(default: allow) detects transmutes of fat pointers]'
'missing-docs[(default: allow) detects missing documentation for public members]'
'unsafe-blocks[(default: allow) usage of an "unsafe" block]'
'unstable[(default: allow) detects use of #\[unstable\] items (incl. items with no stability attribute)]'
'unused-extern-crates[(default: allow) extern crates that are never used]'
'unused-import-braces[(default: allow) unnecessary braces around an imported item]'
'unused-qualifications[(default: allow) detects unnecessarily qualified names]'
'unused-results[(default: allow) unused result of an expression in a statement]'
'unused-typecasts[(default: allow) detects unnecessary type casts that can be removed]'
'variant-size-differences[(default: allow) detects enums with widely varying variant sizes]'
'dead-code[(default: warn) detect unused, unexported items]'
'deprecated[(default: warn) detects use of #\[deprecated\] items]'
'improper-ctypes[(default: warn) proper use of libc types in foreign modules]'
'missing-copy-implementations[(default: warn) detects potentially-forgotten implementations of "Copy"]'
'non-camel-case-types[(default: warn) types, variants, traits and type parameters should have camel case names]'
'non-shorthand-field-patterns[(default: warn) using "Struct { x: x }" instead of "Struct { x }"]'
'non-snake-case[(default: warn) methods, functions, lifetime parameters and modules should have snake case names]'
'non-upper-case-globals[(default: warn) static constants should have uppercase identifiers]'
'overflowing-literals[(default: warn) literal out of range for its type]'
'path-statements[(default: warn) path statements with no effect]'
'raw-pointer-deriving[(default: warn) uses of #\[derive\] with raw pointers are rarely correct]'
'unknown-lints[(default: warn) unrecognized lint attribute]'
'unreachable-code[(default: warn) detects unreachable code paths]'
'unsigned-negation[(default: warn) using an unary minus operator on unsigned type]'
'unused-allocation[(default: warn) detects unnecessary allocations that can be eliminated]'
'unused-assignments[(default: warn) detect assignments that will never be read]'
'unused-attributes[(default: warn) detects attributes that were not used by the compiler]'
'unused-comparisons[(default: warn) comparisons made useless by limits of the types involved]'
'unused-imports[(default: warn) imports that are never used]'
'unused-must-use[(default: warn) unused result of a type flagged as must_use]'
"unused-mut[(default: warn) detect mut variables which don't need to be mutable]"
'unused-parens[(default: warn) "if", "match", "while" and "return" do not need parentheses]'
'unused-unsafe[(default: warn) unnecessary use of an "unsafe" block]'
'unused-variables[(default: warn) detect variables which are not used in any way]'
'warnings[(default: warn) mass-change the level for lints which produce warnings]'
'while-true[(default: warn) suggest using "loop { }" instead of "while true { }"]'
"exceeding-bitshifts[(default: deny) shift exceeds the type's number of bits]"
'unknown-crate-types[(default: deny) unknown crate type found in #\[crate_type\] directive]'
'unknown-features[(default: deny) unknown features found in crate-level #\[feature\] directives]'
'bad-style[non-camel-case-types, non-snake-case, non-upper-case-globals]'
'unused[unused-imports, unused-variables, unused-assignments, dead-code, unused-mut, unreachable-code, unused-must-use, unused-unsafe, path-statements]'
)
_rustc_opts_debug=(
'verbose[in general, enable more debug printouts]'
'time-passes[measure time of each rustc pass]'
'count-llvm-insns[count where LLVM instrs originate]'
'time-llvm-passes[measure time of each LLVM pass]'
'trans-stats[gather trans statistics]'
'asm-comments[generate comments into the assembly (may change behavior)]'
'no-verify[skip LLVM verification]'
'borrowck-stats[gather borrowck statistics]'
'no-landing-pads[omit landing pads for unwinding]'
'debug-llvm[enable debug output from LLVM]'
'show-span[show spans for compiler debugging]'
'count-type-sizes[count the sizes of aggregate types]'
'meta-stats[gather metadata statistics]'
'print-link-args[Print the arguments passed to the linker]'
'gc[Garbage collect shared data (experimental)]'
'print-llvm-passes[Prints the llvm optimization passes being run]'
'ast-json[Print the AST as JSON and halt]'
'ast-json-noexpand[Print the pre-expansion AST as JSON and halt]'
'ls[List the symbols defined by a library crate]'
'save-analysis[Write syntax and type analysis information in addition to normal output]'
'flowgraph-print-loans[Include loan analysis data in --pretty flowgraph output]'
'flowgraph-print-moves[Include move analysis data in --pretty flowgraph output]'
'flowgraph-print-assigns[Include assignment analysis data in --pretty flowgraph output]'
'flowgraph-print-all[Include all dataflow analysis data in --pretty flowgraph output]'
'print-regiion-graph[Prints region inference graph. Use with RUST_REGION_GRAPH=help for more info]'
'parse-only[Parse only; do not compile, assemble, or link]'
'no-trans[Run all passes except translation; no output]'
'no-analysis[Parse and expand the source, but run no analysis]'
'unstable-options[Adds unstable command line options to rustc interface]'
'print-enum-sizes[Print the size of enums and their variants]'
)
_rustc_opts_fun_lint(){
_values -s , 'options' \
"$_rustc_opts_lint[@]"
}
_rustc_opts_fun_debug(){
_values 'options' "$_rustc_opts_debug[@]"
}
_rustc_opts_fun_codegen(){
_values 'options' "$_rustc_opts_codegen[@]"
}
_rustc_opts_fun_link(){
_values 'options' "$_rustc_opts_link[@]"
}
_arguments -s : \
'(-W --warn)'{-W,--warn=}'[Set lint warnings]:lint options:_rustc_opts_fun_lint' \
'(-A --allow)'{-A,--allow=}'[Set lint allowed]:lint options:_rustc_opts_fun_lint' \
'(-D --deny)'{-D,--deny=}'[Set lint denied]:lint options:_rustc_opts_fun_lint' \
'(-F --forbid)'{-F,--forbid=}'[Set lint forbidden]:lint options:_rustc_opts_fun_lint' \
'*-Z[Set internal debugging options]:debug options:_rustc_opts_fun_debug' \
'(-C --codegen)'{-C,--codegen}'[Set internal Codegen options]:codegen options:_rustc_opts_fun_codegen' \
'*-l[Link the generated crates to the specified native library NAME. the optional KIND can be one of, static, dylib, or framework. If omitted, dylib is assumed.]:ARG:_rustc_opts_fun_link' \
"$_rustc_opts_switches[@]" \
"$_rustc_opts_vals[@]" \
'::files:_files -g "*.rs"'

1070
zsh/completions/_rustup Normal file

File diff suppressed because it is too large Load diff

View file

@ -58,3 +58,6 @@ setopt hist_verify
setopt inc_append_history setopt inc_append_history
# synchronize history between active sessions # synchronize history between active sessions
setopt share_history setopt share_history
# Among other things, used for compatibility with OMZ plugins.
ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/dotfiles"

View file

@ -109,8 +109,7 @@ path_prepend path ~/.cargo/bin
# add my binaries and completions # add my binaries and completions
path_prepend path "${ZSH_DOTFILES:h}/scripts" path_prepend path "${ZSH_DOTFILES:h}/scripts"
path_prepend fpath "${ZSH_DOTFILES}/completions" path_prepend fpath "$ZSH_DOTFILES/completions"
path_prepend fpath "${ZSH_CACHE_DIR}/site-functions"
# add user binaries # add user binaries
path_prepend path ~/.local/bin path_prepend path ~/.local/bin

View file

@ -1,5 +1,7 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
mkdir -pv "$ZSH_CACHE_DIR"
_plugin() { _plugin() {
_perf_timer_start "plugin $1" _perf_timer_start "plugin $1"
plugin "$@" plugin "$@"
@ -9,22 +11,8 @@ _plugin() {
_checkout_latest_version='build=plugin-cfg-git-checkout-version "*"' _checkout_latest_version='build=plugin-cfg-git-checkout-version "*"'
_plugin completions 'zsh-users/zsh-completions' "$_checkout_latest_version" _plugin completions 'zsh-users/zsh-completions' "$_checkout_latest_version"
_plugin completions-rustc 'https://raw.githubusercontent.com/rust-lang/zsh-config/master/_rust' from=url \
after_load='plugin-cfg-path fpath prepend ""'
_plugin completions-cargo 'https://raw.githubusercontent.com/rust-lang/cargo/master/src/etc/_cargo' from=url \
after_load='plugin-cfg-path fpath prepend ""'
rustup_comp_path="${ZSH_CACHE_DIR}/site-functions/_rustup"
if [[ "${commands[rustup]}" -nt "$rustup_comp_path" || ! -s "$rustup_comp_path" ]]; then
_perf_timer_start "generate rustup completions"
rustup completions zsh >| "$rustup_comp_path"
_perf_timer_stop "generate rustup completions"
fi
unset rustup_comp_path
# compinit {{{ # compinit {{{
_perf_timer_start "compinit"
# note that completion system must be initialized after zsh-completions and # note that completion system must be initialized after zsh-completions and
# before Oh My Zsh # before Oh My Zsh
autoload -U compinit autoload -U compinit
@ -51,8 +39,6 @@ unset rustup_comp_path
compinit -C -d "${ZSH_CACHE_DIR}/zcompdump" compinit -C -d "${ZSH_CACHE_DIR}/zcompdump"
fi fi
unset run_compdump unset run_compdump
_perf_timer_stop "compinit"
# }}} # }}}
# Oh My Zsh {{{ # Oh My Zsh {{{
@ -83,7 +69,6 @@ unset rustup_comp_path
if command_exists fasd; then if command_exists fasd; then
export _FASD_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/fasd_db.csv" export _FASD_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/fasd_db.csv"
_perf_timer_start "fasd init"
# Initialization taken from <https://github.com/ohmyzsh/ohmyzsh/blob/6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed/plugins/fasd/fasd.plugin.zsh> # Initialization taken from <https://github.com/ohmyzsh/ohmyzsh/blob/6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed/plugins/fasd/fasd.plugin.zsh>
fasd_cache="${ZSH_CACHE_DIR}/fasd-init-cache" fasd_cache="${ZSH_CACHE_DIR}/fasd-init-cache"
if [[ "${commands[fasd]}" -nt "$fasd_cache" || ! -s "$fasd_cache" ]]; then if [[ "${commands[fasd]}" -nt "$fasd_cache" || ! -s "$fasd_cache" ]]; then
@ -91,7 +76,6 @@ unset rustup_comp_path
fi fi
source "$fasd_cache" source "$fasd_cache"
unset fasd_cache unset fasd_cache
_perf_timer_stop "fasd init"
alias v='f -e "$EDITOR"' alias v='f -e "$EDITOR"'
alias o='a -e xdg-open' alias o='a -e xdg-open'

View file

@ -46,7 +46,7 @@ fi
# Directory in which plugins are stored. It is separate from $ZPLG_HOME for # Directory in which plugins are stored. It is separate from $ZPLG_HOME for
# compatitability with future versions. # compatitability with future versions.
ZPLG_PLUGINS_DIR="$ZPLG_HOME/plugins" _ZPLG_PLUGINS_DIR="$ZPLG_HOME/plugins"
# basic logging {{{ # basic logging {{{
@ -302,7 +302,7 @@ plugin() {
# download plugin {{{ # download plugin {{{
local plugin_dir="$ZPLG_PLUGINS_DIR/$plugin_id" local plugin_dir="$_ZPLG_PLUGINS_DIR/$plugin_id"
# simple check whether the plugin directory exists is enough for me # simple check whether the plugin directory exists is enough for me
if [[ ! -d "$plugin_dir" ]]; then if [[ ! -d "$plugin_dir" ]]; then
_zplg_log "downloading $plugin_id" _zplg_log "downloading $plugin_id"
@ -478,7 +478,7 @@ _zplg_is_plugin_loaded() {
plugin_url="${ZPLG_LOADED_PLUGIN_URLS[$plugin_id]}" plugin_url="${ZPLG_LOADED_PLUGIN_URLS[$plugin_id]}"
plugin_from="${ZPLG_LOADED_PLUGIN_SOURCES[$plugin_id]}" plugin_from="${ZPLG_LOADED_PLUGIN_SOURCES[$plugin_id]}"
plugin_dir="$ZPLG_PLUGINS_DIR/$plugin_id" plugin_dir="$_ZPLG_PLUGINS_DIR/$plugin_id"
_zplg_log "upgrading $plugin_id" _zplg_log "upgrading $plugin_id"
_zplg_source_"$plugin_from"_upgrade "$plugin_url" "$plugin_dir" || return "$?" _zplg_source_"$plugin_from"_upgrade "$plugin_url" "$plugin_dir" || return "$?"
@ -512,7 +512,7 @@ _zplg_is_plugin_loaded() {
plugin_url="${ZPLG_LOADED_PLUGIN_URLS[$plugin_id]}" plugin_url="${ZPLG_LOADED_PLUGIN_URLS[$plugin_id]}"
plugin_from="${ZPLG_LOADED_PLUGIN_SOURCES[$plugin_id]}" plugin_from="${ZPLG_LOADED_PLUGIN_SOURCES[$plugin_id]}"
plugin_dir="$ZPLG_PLUGINS_DIR/$plugin_id" plugin_dir="$_ZPLG_PLUGINS_DIR/$plugin_id"
_zplg_log "removing $plugin_id" _zplg_log "removing $plugin_id"
rm -rf "$plugin_dir" rm -rf "$plugin_dir"
@ -543,7 +543,7 @@ _zplg_is_plugin_loaded() {
return 1 return 1
fi fi
local plugin_dir="$ZPLG_PLUGINS_DIR/$plugin_id" local plugin_dir="$_ZPLG_PLUGINS_DIR/$plugin_id"
_zplg_log "removing $plugin_id" _zplg_log "removing $plugin_id"
rm -rf "$plugin_dir" rm -rf "$plugin_dir"

View file

@ -2,10 +2,6 @@
ZSH_DOTFILES="${0:h}" ZSH_DOTFILES="${0:h}"
# Among other things, used for compatibility with OMZ plugins.
ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/dotfiles"
mkdir -pv -- "$ZSH_CACHE_DIR" "${ZSH_CACHE_DIR}/site-functions"
autoload -U colors && colors autoload -U colors && colors
# Performance {{{ # Performance {{{