From edf62953c4a00d2da71a9e650ccb8b829a9ccdd1 Mon Sep 17 00:00:00 2001
From: "cheese.cake"
Date: Sun, 15 Mar 2020 17:54:29 +0900
Subject: [PATCH 01/47] add README-ko.md
---
README.md | 2 +-
doc/README-ko.md | 560 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 561 insertions(+), 1 deletion(-)
create mode 100644 doc/README-ko.md
diff --git a/README.md b/README.md
index db80f69e..96058de5 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
Installation •
Customization •
Project goals, alternatives •
- Translation [中文][日本語]
+ Translation [中文][日本語][한국어]
### Syntax highlighting
diff --git a/doc/README-ko.md b/doc/README-ko.md
new file mode 100644
index 00000000..ab49596d
--- /dev/null
+++ b/doc/README-ko.md
@@ -0,0 +1,560 @@
+
+ 
+
+
+
+ 
+ A cat(1) clone with syntax highlighting and Git integration.
+ 문법 강조와 깃 통합 기능의 cat(1) 클론
+
+
+
+ 주요 기능들 •
+ 사용법 •
+ 설치 •
+ 커스터마이즈 •
+ 프로젝트 목표와 대안들 •
+ 번역 [中文][日本語]
+
+
+### 문법 강조
+
+`bat`은 다양한 프로그래밍 언어와 마크업 언어에 대해 문법 강조(Syntax highlighting)기능을 지원하고 있습니다:
+
+
+
+### Git 통합
+
+`bat`은 `git`을 통해 인덱스와 함께 변경분을 표시합니다 (왼쪽 바를 확인하세요):
+
+
+
+### 표시할 수 없는 문자 처리
+
+`-A`/`--show-all` 옵션을 사용하여 표시할수 없는 문자를 시각화 해줍니다:
+
+
+
+### 자동 페이징
+
+하나의 화면에 비해 출력이 너무 큰 경우, `less` 를 이용해 출력들을 연결할 수 있습니다.
+
+### 파일 연결
+
+이 뿐만 아니라 파일을 연결할 때도 사용 할 수 있습니다. :wink: `bat`가 인터렉티브 하지 않은(non-interactive)가 감지하면 (예를 들어,다른 프로세스 혹은 파일과 파이프라인을 연결 한 경우) `bat`은 `cat`을 대신하여 동작하며 일반 파일 내용을 표기해줍니다.
+
+## 사용법
+
+터미널에서 하나의 파일 표시하기
+
+```bash
+> bat README.md
+```
+
+여러 파일 한번에 보여주기
+
+```bash
+> bat src/*.rs
+```
+
+stdin에서 읽고, 자동으로 맞는 문법 강조 적용하기
+
+```bash
+> curl -s https://sh.rustup.rs | bat
+```
+
+stdin에서 읽고, 명시적으로 언어 지정하여 적용하기
+
+```bash
+> yaml2json .travis.yml | json_pp | bat -l json
+```
+
+표시할 수 없는 문자 처리하기
+```bash
+> bat -A /etc/hosts
+```
+
+`cat` 대신 사용하기:
+
+```bash
+bat > note.md # quickly create a new file
+
+bat header.md content.md footer.md > document.md
+
+bat -n main.rs # show line numbers (only)
+
+bat f - g # output 'f', then stdin, then 'g'.
+```
+
+### 다른 툴과의 통합
+
+#### `find` 와 `fd`
+
+`find`의 `-exec` 옵션을 사용하여 `bat`의 모든 검색 결과를 미리 볼 수 있습니다:
+```bash
+find … -exec bat {} +
+```
+
+[`fd`](https://github.com/sharkdp/fd)를 사용하고 있는 경우, `-X`/`--exec-batch` 옵션을 이용하여 동일하게 사용할 수 있습니다:
+```bash
+fd … -X bat
+```
+
+#### `ripgrep`
+
+[`batgrep`](https://github.com/eth-p/bat-extras/blob/master/doc/batgrep.md)과 함께, [`ripgrep`](https://github.com/BurntSushi/ripgrep)의 검색 결과를 `bat`을 이용하여 볼 수 있습니다.
+
+```bash
+batgrep needle src/
+```
+
+#### `tail -f`
+
+`bat` 과 `tail -f`를 함께 사용하여, 특정 파일을 문법 강조하며 지속적으로 모니터링 할 수 있습니다.
+```bash
+tail -f /var/log/pacman.log | bat --paging=never -l log
+```
+이 작업을 하려면 페이징 기능을 꺼야합니다. 또, 자동 감지가 되지 않기 때문에, 적용되어야할 문법을 명시적(`-l log`)으로 지정해야 합니다.
+
+#### `git`
+
+`bat`과 `git show`를 함께 사용하여 주어진 파일의 이전 기록을 문법 강조와 함께 볼 수 있습니다:
+```bash
+git show v0.6.0:src/main.rs | bat -l rs
+```
+
+diffs 내에서 문법 강조 표시는 현재 지원되지 않습니다. 이 기능은 [`delta`](https://github.com/dandavison/delta)에서 찾아 볼 수 있습니다.
+
+#### `xclip`
+
+`bat` 출력에서 라인 넘버와 Git 수정 내역이 같이 있어 파일 내용을 복사하기가 어려울 수도 있습니다. 이 경우에는 `-p`/`--plain` 옵션을 사용 하거나 출력 시 파이프라인으로 `xclip`을 사용하면 됩니다:
+```bash
+bat main.cpp | xclip
+```
+`bat` 에서는 리다이렉트된 것으로 감지하여, 파일 내용만 출력합니다.
+
+#### `man`
+
+`bat`은 `MANPAGER` 환경 변수 설정을 통해 `man`에 대하여 컬러 페이져를 사용할 수 있습니다:
+
+```bash
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+man 2 select
+```
+
+포매팅 문제가 발생한다면, `MANROFFOPT="-c"` 설정 해야 할 수도 있습니다 .
+
+새 커맨드에서 이 번들을 사용하려면, [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md)를 이용 할 수 있습니다.
+
+참고 : [Manpage syntax](assets/syntaxes/Manpage.sublime-syntax)는 이 저장소에서 개발되고 있으며, 아직 작업 중 입니다.
+
+#### `prettier` / `shfmt` / `rustfmt`
+
+[`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) 스크립트는 코드를 포맷팅하고 `bat`으로 출력해주는 랩퍼(wrapper) 입니다.
+
+
+## 설치
+
+[](https://repology.org/project/bat/versions)
+
+### On Ubuntu
+*... 그리고 기타 Debian 기반의 Linux 배포판들.*
+
+Ubuntu Eoan 19.10 혹은 Debian unstable sid 이후 버전 부터는 [Ubuntu용 `bat` 패키지](https://packages.ubuntu.com/eoan/bat)나 [Debian용 `bat` 패키지](https://packages.debian.org/sid/bat) 를 설치 할 수 있습니다.
+
+```bash
+apt install bat
+```
+최신 버전의 bat를 실행하거나 이전 버전의 Ubuntu / Debian .deb을 사용중인 경우 릴리스 페이지 에서 최신 패키지를 다운로드하여 다음을 통해 설치하십시오.
+
+만약 최근 릴리즈된 bat을 사용을 원하거나 buntu/Debian 이전 버전을 사용하는 경우, [release page](https://github.com/sharkdp/bat/releases)애서 다음과 같이 `.deb` 패키지를 받아 설치 할 수도 있습니다:
+
+```bash
+sudo dpkg -i bat_0.12.1_amd64.deb # adapt version number and architecture
+```
+
+### On Alpine Linux
+
+공식 소스를 통해 [`bat` 패키지](https://pkgs.alpinelinux.org/packages?name=bat) 를 설치 할 수 있습니다:
+
+```bash
+apk add bat
+```
+
+### On Arch Linux
+
+공식 소스를 통해 [`bat` 패키지](https://www.archlinux.org/packages/community/x86_64/bat/)를 설치할 수 있습니다:
+
+```bash
+pacman -S bat
+```
+
+### On Fedora
+
+[공식 Fedora 모듈 저장소](https://docs.fedoraproject.org/en-US/modularity/using-modules/)에서 [`bat` 패키지](https://koji.fedoraproject.org/koji/packageinfo?packageID=27506)을 설치할 수 있습니다:
+
+```bash
+dnf install bat
+```
+
+### On Gentoo Linux
+
+공식 소스를 통해 [`bat` 패키지](https://packages.gentoo.org/packages/sys-apps/bat)를 설치할 수 있습니다.
+
+```bash
+emerge sys-apps/bat
+```
+
+### On Void Linux
+
+xbps-install를 이용해 `bat`을 설치할 수 있습니다:
+```bash
+xbps-install -S bat
+```
+
+### On FreeBSD
+
+pkg를 이용하여 미리 컴파일된 [`bat` 패키지](https://www.freshports.org/textproc/bat)를 설치할 수 있습니다:
+
+```bash
+pkg install bat
+```
+
+또는 FreeBSD 포트에서 직접 빌드할 수도 있습니다:
+
+```bash
+cd /usr/ports/textproc/bat
+make install
+```
+
+### Via nix
+
+[nix package manager](https://nixos.org/nix)를 이용해 `bat`을 설치할 수 있습니다:
+
+```bash
+nix-env -i bat
+```
+
+### On openSUSE
+
+zypper을 이용해 `bat`을 설치할 수 있습니다:
+
+```bash
+zypper install bat
+```
+
+### On macOS
+
+[Homebrew](http://braumeister.org/formula/bat)를 이용해 `bat`을 설치할 수 있습니다:
+
+```bash
+brew install bat
+```
+
+또는 [MacPorts](https://ports.macports.org/port/bat/summary)를 사용할 수도 있습니다:
+
+```bash
+port install bat
+```
+
+### On Windows
+
+Windows에서 `bat`을 설치할 수 있는 몇 가지 옵션들이 있습니다. 먼저 `bat`을 설치 한 후, ["Windows에서 사용하기"](#Windows에서-사용하기) 참고하시기 바랍니다.
+
+#### With Chocolatey
+
+[Chocolatey](https://chocolatey.org/packages/Bat)를 이용해 `bat`을 설치할 수 있습니다:
+```bash
+choco install bat
+```
+
+#### With Scoop
+
+[scoop](https://scoop.sh/)을 이용해 `bat`을 설치할 수 있습니다:
+```bash
+scoop install bat
+```
+[Visual C++ Redistributable 패키지](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)를 같이 설치해 주어야 합니다.
+
+#### From prebuilt binaries:
+
+[릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 빌드된 바이너리를 다운받을 수 있습니다.
+
+[Visual C++ Redistributable 패키지](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)를 같이 설치해 주어야 합니다.
+
+### Via Docker
+
+컨테이너에서 `bat`을 사용할 수 있는 [Docker image](https://hub.docker.com/r/danlynn/bat/)가 있습니다.:
+```bash
+docker pull danlynn/bat
+alias bat='docker run -it --rm -e BAT_THEME -e BAT_STYLE -e BAT_TABS -v "$(pwd):/myapp" danlynn/bat'
+```
+
+### Via Ansible
+
+[Ansible](https://www.ansible.com/)을 사용해 `bat`을 설치할 수 있습니다:
+
+```bash
+# Install role on local machine
+ansible-galaxy install aeimer.install_bat
+```
+
+```yaml
+---
+# Playbook to install bat
+- host: all
+ roles:
+ - aeimer.install_bat
+```
+
+- [Ansible Galaxy](https://galaxy.ansible.com/aeimer/install_bat)
+- [GitHub](https://github.com/aeimer/ansible-install-bat)
+
+다음 배포판들에서 동작합니다:
+- Debian/Ubuntu
+- ARM (eg. Raspberry PI)
+- Arch Linux
+- Void Linux
+- FreeBSD
+- MacOS
+
+### From binaries
+
+[릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다양한 환경을 위해 빌드된 버전들을 확인 할 수 있습니다. 정적 링크 바이너리들은 아카이브에서 파일 이름에 `musl` 이 포함 파일로 확인 할 수 있습니다.
+
+### From source
+
+`bat`의 소스를 직접 빌드하기 위해서는, Rust 1.36 이상이 필요하며 `cargo`를 이용해 빌드할 수 있습니다.
+
+```bash
+cargo install bat
+```
+
+일부 플랫폼에서는 `llvm` 그리고/또는 `libclang-dev` 설치가 필요할 수도 있습니다.
+
+## 커스터마이즈
+
+### 문법 강조 테마
+
+`bat --list-themes`을 사용하면, 현재 사용 가능한 문법 강조 테마들을 확인할 수 있습니다. `TwoDark` 테마 선택하는 경우, `--theme=TwoDark` 옵션과 함께 `bat`을 사용하거나 환경변수에서 `BAT_THEME`를 `TwoDark`로 세팅해주면 됩니다. 쉘 시작 파일에 `export BAT_THEME="TwoDark"` 를 정의해 계속 사용도 가능합니다. 이 밖에 `bat`의 [설정파일](https://github.com/sharkdp/bat#configuration-file)을 이용할 수도 있습니다.
+
+다른 테마를 미리 보고 싶은경우 다음 명령어와 같이 사용할 수 있습니다.(이 경우 [`fzf`](https://github.com/junegunn/fzf)가 필요합니다.)
+
+```bash
+bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"
+```
+`bat`의 기본 테마는 어두운 배경색 터미널에 적합합니다. 만일 밝은 배경색을 사용할 경우에는 `GitHub` 이나 `OneHalfLight` 과 같은 테마가 더 잘 어울립니다. 아래 [새로운 테마 추가하기](#새로운-테마-추가하기)에 따라 커스텀 테마를 사용할수도 있습니다.
+
+### 출력 스타일
+
+`--style` 옵션을 이용하여 `bat`의 출력 스타일을 변경 할 수 있습니다. 예를 들어, `--style=numbers,changes`는 Git 변경분과 라인 넘버에 대해서만 출력하며 눈금과 파일 헤더가 표시되지 않습니다. `BAT_STYLE` 환경 변수로 정의하여 계속해서 사용하거나`bat`의 [설정 파일](#설정-파일)을 사용할 수도 있습니다.
+
+### 새로운 문법 강조 / 언어 추가하기
+
+`bat`은 문법 강조를 위해 [`syntect`](https://github.com/trishume/syntect/) 라이브러리를 사용하고 있습니다. `syntect`는 [Sublime Text의 `.sublime-syntax` 파일](https://www.sublimetext.com/docs/3/syntax.html)과 테마를 읽을 수 있습니다. 새로운 문법 강조를 추가하는 방법은 다음과 같습니다.
+
+우선 문법 정의 파일을 넣을 폴더를 만듭니다:
+
+```bash
+mkdir -p "$(bat --config-dir)/syntaxes"
+cd "$(bat --config-dir)/syntaxes"
+
+# Put new '.sublime-syntax' language definition files
+# in this folder (or its subdirectories), for example:
+git clone https://github.com/tellnobody1/sublime-purescript-syntax
+```
+
+다음 명령어를 통해 파일을 바이너리 캐시로 파싱합니다.
+
+```bash
+bat cache --build
+```
+
+마지막으로 `bat --list-languages`을 통해 새로운 언어가 사용 가능한지 확인합니다.
+
+기본 설정으로 돌아가려면, 다음 명령어를 이용합니다.:
+
+```bash
+bat cache --clear
+```
+
+### 새로운 테마 추가하기
+
+새로운 문법 정의 추가와 매우 유사합니다.
+
+먼저, 새로운 문법 강조 테마 폴더를 만듭니다.
+```bash
+mkdir -p "$(bat --config-dir)/themes"
+cd "$(bat --config-dir)/themes"
+
+# Download a theme in '.tmTheme' format, for example:
+git clone https://github.com/greggb/sublime-snazzy
+
+# Update the binary cache
+bat cache --build
+```
+
+마지막으로 `bat --list-themes`을 통해 새로운 테마가 사용 가능한지 확인합니다.
+
+### 다른 페이져 사용하기
+
+`bat`은 환경변수 `PAGER`로 사용할 페이져를 명시합니다. 만약 이 변수가 정의되어있지 않다면 `less`가 기본입니다. 만약 다른 페이져를 사용하고 싶다면 `PAGER` 변수를 수정하거나 `BAT_PAGER` 환경 변수로 `PAGER` 대신 정의 할 수도 있습니다.
+
+만약 커맨드라인 인수로 넘기려면, `PAGER`/`BAT_PAGER` 변수를 정의를 통해 사용 할 수 있습니다. :
+
+```bash
+export BAT_PAGER="less -RF"
+```
+
+환경 변수 대신, `bat`의 [설정 파일](#설정-파일)에서 페이져를 설정 할 수도 있습니다.(`--pager` 옵션)
+
+**참고**: 기본적으로 페이져가 `less`로 설정 되어있다면, `bat`은 다음 옵션들을 받을 수 있습니다: `-R`/`--RAW-CONTROL-CHARS`,
+`-F`/`--quit-if-one-screen` 그리고 `-X`/`--no-init`. 마지막 옵션(`-X`)은 530 이전 버전에서만 사용됩니다.
+
+`-R` 옵션은 ANSI 컬러를 올바르게 해석하기 위해 필요합니다. 두번째 옵션 (`-F`)은 출력 크기가 터미널의 세로 크기보다 작을 경우 즉시 종료되도록 합니다.
+페이져를 종료하기 위해 `q`를 누를 필요 없기 때문에 작은 파일을 다룰 때 용이합니다. 세번째 옵션(`-X`)는 `less` 이전 버전의 `--quit-if-one-screen` 기능과 함께 버그를 잡을 때 필요합니다. 안타깝게도, `less`의 마우스 휠 지원은 종료합니다.
+
+`less` 예전 버전에서 마우스 휠 기능을 활성화 시키려면, `-R` 옵션을 사용하면 됩니다. (위의 예제처럼, 이 옵션은 quit-if-one-screen 기능을 비활성화 시킵니다.)
+530 이하 버전에서는 그대로 사용할 수 있습니다.
+
+### 다크 모드
+
+macOS에서 다크 모드를 사용하고 있다면, OS 테마에 따라 다른 테마를 사용하도록 `bat`의 구성할 수 있습니다. 아래 코드는 라이트 모드에서는 `default` 테마를 다크모드에서는 `Github` 테마를 사용하는 방법입니다.
+
+```bash
+alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"
+```
+
+## 설정 파일
+
+`bat` 설정 파일로 커스터마이즈 할 수 있습니다. 파일의 위치는 운영 체제에 따라 다릅니다. 아래 커맨드를 통해 시스템의 기본 경로를 알 수 있습니다.
+```
+bat --config-file
+```
+
+또는, `BAT_CONFIG_PATH` 환경 변수를 사용하여 `bat`의 설정 파일 위치를 지정할 수 있습니다.
+```bash
+export BAT_CONFIG_PATH="/path/to/bat.conf"
+```
+
+### 포맷
+
+설정 파일은 명령어 인수들의 리스트 입니다. `bat --help`를 이용하여 가능한 옵션들과 값들을 확인해 볼 수 있습니다. 또, `#` 으로 주석을 추가할수도 있습니다.
+
+설정 파일의 예:
+```bash
+# Set the theme to "TwoDark"
+--theme="TwoDark"
+
+# Show line numbers, Git modifications and file header (but no grid)
+--style="numbers,changes,header"
+
+# Use italic text on the terminal (not supported on all terminals)
+--italic-text=always
+
+# Use C++ syntax (instead of C) for .h header files
+--map-syntax h:cpp
+
+# Use "gitignore" highlighting for ".ignore" files
+--map-syntax .ignore:.gitignore
+```
+
+## Windows에서 사용하기
+
+`bat` 대부분의 경우 Windows에서 기본적으로 잘 작동하지만, 일부 기능에는 추가 적인 구성이 필요할 수 있습니다.
+
+### 페이징
+
+Windows는 `more` 형식의 매우 제한된 페이저만이 포함되어있습니다. `less`용 Windows 바이너리는 [이 홈페이지](http://www.greenwoodsoftware.com/less/download.html)나 [Chocolatey](https://chocolatey.org/packages/Less)에서 다운로드 받을 수 있습니다. 이를 사용하려면 바이너리를 `PATH` 디렉토리에 배치하거나 [환경 변수로 정의](#using-a-different-pager) 하세요. [Chocolatey 패키지](#on-windows)로 `less`를 자동으로 설치할 수 있습니다.
+
+### 색상
+
+Windows 10은 기본 내장기능으로 [v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update)) 이후의 `conhost.exe`(Command Prompt) 와 PowerShell, 그리고 최신 버전의 bash에서 색상을 지원합니다. 이전 버전의 Windows에서는, [ConEmu](https://conemu.github.io/)가 포함 된 [Cmder](http://cmder.net/)를 사용할 수 있습니다 .
+
+**참고:** `less`의 Git과 MSYS 버전은 Windows에서 색상을 올바르게 해석하지 않습니다. 다른 페이져가 설치되어 있지 않은 경우, `--paging=never` 하거나 `BAT_PAGER`를 빈 문자열로 설정하여 페이징을 완전히 비활성화 할 수 있습니다 .
+
+### Cygwin
+
+Windows에서의 `bat`은 기본적으로 Cygwin의 unix 스타일의 경로(`/cygdrive/*`)를 지원하지 않습니다. cygwin 절대경로를 인자로 받았을 때, `bat`은 다음과 같이 오류를 반환합니다. `:The system cannot find the path specified. (os error 3)`
+
+이 경우, wrapper를 만들거나 다음 함수를 `.bash_profile`추가하여 문제를 해결하실 수 있습니다 :
+
+```bash
+bat() {
+ local index
+ local args=("$@")
+ for index in $(seq 0 ${#args[@]}) ; do
+ case "${args[index]}" in
+ -*) continue;;
+ *) [ -e "${args[index]}" ] && args[index]="$(cygpath --windows "${args[index]}")";;
+ esac
+ done
+ command bat "${args[@]}"
+}
+```
+
+## 트러블슈팅
+
+### 터미널과 색상
+
+`bat`은 터미널 트루컬러 지원 여부와 상관없이 동작합니다. 하지만, 문법 강조 테마의 색상이 8-bit 컬러에는 최적화 되어 있지 않고 있으며, 24-bit 트루컬러 지원하는 터미널 사용하는 것을 적극 권장합니다.(`terminator`, `konsole`, `iTerm2`, ...). [이 글](https://gist.github.com/XVilka/8346728)에서 24-bit 트루컬러 지원하는 터미널들을 찾아보실 수 있습니다.
+
+사용하고 있는 터미널에서 `COLORTERM`을 `truecolor` 혹은
+`24bit`으로 설정 되어있는지 확인하세요. 만약 아니라면, `bat`은 24-bit escape sequence를 지원되는지 여부를 판단 할 수 없습니다. (그리고 8-bit 색상으로 돌아갑니다.)
+
+### 라인 숫자와 눈금이 잘 보이지 않는 경우
+
+다른 테마를 사용해 보세요. (`bat --list-themes`에서 테마들을 확인해 볼 수 있습니다.) `OneHalfDark` 과 `OneHalfLight` 테마는 눈금과 선의 색을 밝게 합니다.
+
+### 파일 인코딩
+
+`bat`은 기본적으로 UTF-8과 UTF-8을 제공합니다. 다른 파일 인코딩의 경우, 자동 감지 되지 않으므로 UTF-8로 먼저 변환해 주어야 합니다. 이렇게 할 때, `iconv`를 사용 할 수 있습니다. 예를 들어, Latin-1 (ISO-8859-1)로 인코딩된 PHP파일이라면 다음과 같이 사용할 수 있습니다.:
+``` bash
+iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
+```
+참고: `bat`으로 자동 감지가 되지 않는 경우에는 `-l`/`--language` 옵션을 사용할 수도 있습니다.
+
+## 배포
+
+```bash
+# Recursive clone to retrieve all submodules
+git clone --recursive https://github.com/sharkdp/bat
+
+# Build (debug version)
+cd bat
+cargo build --bins
+
+# Run unit tests and integration tests
+cargo test
+
+# Install (release version)
+cargo install
+
+# Build a bat binary with modified syntaxes and themes
+bash assets/create.sh
+cargo install -f
+```
+
+## 메인테이너들
+
+- [sharkdp](https://github.com/sharkdp)
+- [eth-p](https://github.com/eth-p)
+
+## 프로젝트 목표와 대안들
+
+`bat`은 아래와 같은 목표를 달성하려고 합니다:
+
+- 아름답고 발전된 문법 강조 기능
+- Git 연동을 통한 파일 수정 내역 확인
+- (POSIX)`cat`의 대체제
+- 사용자 친화적인 CLI 제공
+
+
+비슷한 프로그램들을 찾고 있다면, 많은 대안들이 있습니다. 비교는 [이 문서]((doc/alternatives.md))를 참조해주세요.
+
+## 라이센스
+Copyright (c) 2018-2020 [bat-developers](https://github.com/sharkdp/bat).
+
+`bat`는 MIT 라이센스 및 Apache 라이센스 2.0의 조건에 따라 배포됩니다.
+
+라이센스 세부사항은 [LICENSE-APACHE](LICENSE-APACHE)와 [LICENSE-MIT](LICENSE-MIT)를 참조하세요.
From f525fb974e25a3ad8ae219a9b73ee011cf987ccc Mon Sep 17 00:00:00 2001
From: "cheese.cake"
Date: Sun, 15 Mar 2020 18:05:36 +0900
Subject: [PATCH 02/47] fix typo and broken links
---
doc/README-ko.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/README-ko.md b/doc/README-ko.md
index ab49596d..50fd5920 100644
--- a/doc/README-ko.md
+++ b/doc/README-ko.md
@@ -1,10 +1,10 @@
- 
+ 

- A cat(1) clone with syntax highlighting and Git integration.
+
문법 강조와 깃 통합 기능의 cat(1) 클론
@@ -144,9 +144,10 @@ man 2 select
포매팅 문제가 발생한다면, `MANROFFOPT="-c"` 설정 해야 할 수도 있습니다 .
-새 커맨드에서 이 번들을 사용하려면, [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md)를 이용 할 수 있습니다.
+새 커맨드에서 이 번들을 사용하려면, [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md)을 이용 할 수 있습니다.
-참고 : [Manpage syntax](assets/syntaxes/Manpage.sublime-syntax)는 이 저장소에서 개발되고 있으며, 아직 작업 중 입니다.
+
+참고 : [Manpage syntax](../assets/syntaxes/Manpage.sublime-syntax)는 이 저장소에서 개발되고 있으며, 아직 작업 중 입니다.
#### `prettier` / `shfmt` / `rustfmt`
@@ -165,9 +166,8 @@ Ubuntu Eoan 19.10 혹은 Debian unstable sid 이후 버전 부터는 [Ubuntu용
```bash
apt install bat
```
-최신 버전의 bat를 실행하거나 이전 버전의 Ubuntu / Debian .deb을 사용중인 경우 릴리스 페이지 에서 최신 패키지를 다운로드하여 다음을 통해 설치하십시오.
-만약 최근 릴리즈된 bat을 사용을 원하거나 buntu/Debian 이전 버전을 사용하는 경우, [release page](https://github.com/sharkdp/bat/releases)애서 다음과 같이 `.deb` 패키지를 받아 설치 할 수도 있습니다:
+만약 최근 릴리즈된 bat을 사용을 원하거나 buntu/Debian 예전 버전을 사용하는 경우, [릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다음과 같이 `.deb` 패키지를 받아 설치 할 수도 있습니다:
```bash
sudo dpkg -i bat_0.12.1_amd64.deb # adapt version number and architecture
@@ -336,7 +336,7 @@ cargo install bat
### 문법 강조 테마
-`bat --list-themes`을 사용하면, 현재 사용 가능한 문법 강조 테마들을 확인할 수 있습니다. `TwoDark` 테마 선택하는 경우, `--theme=TwoDark` 옵션과 함께 `bat`을 사용하거나 환경변수에서 `BAT_THEME`를 `TwoDark`로 세팅해주면 됩니다. 쉘 시작 파일에 `export BAT_THEME="TwoDark"` 를 정의해 계속 사용도 가능합니다. 이 밖에 `bat`의 [설정파일](https://github.com/sharkdp/bat#configuration-file)을 이용할 수도 있습니다.
+`bat --list-themes`을 사용하면, 현재 사용 가능한 문법 강조 테마들을 확인할 수 있습니다. `TwoDark` 테마 선택하는 경우, `--theme=TwoDark` 옵션과 함께 `bat`을 사용하거나 환경변수에서 `BAT_THEME`를 `TwoDark`로 세팅해주면 됩니다. 쉘 시작 파일에 `export BAT_THEME="TwoDark"` 를 정의해 계속 사용도 가능합니다. 이 밖에 `bat`의 [설정 파일](#설정-파일)을 이용할 수도 있습니다.
다른 테마를 미리 보고 싶은경우 다음 명령어와 같이 사용할 수 있습니다.(이 경우 [`fzf`](https://github.com/junegunn/fzf)가 필요합니다.)
From 2e07aabb746cddbcd76694b155194d579c23e44f Mon Sep 17 00:00:00 2001
From: "cheese.cake"
Date: Sun, 15 Mar 2020 18:07:38 +0900
Subject: [PATCH 03/47] fix links
---
doc/README-ja.md | 2 +-
doc/README-ko.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/README-ja.md b/doc/README-ja.md
index c338e4f2..a018e07c 100644
--- a/doc/README-ja.md
+++ b/doc/README-ja.md
@@ -13,7 +13,7 @@
インストール •
カスタマイズ •
プロジェクトの目標と既存の類似したOSS •
- 翻訳 [中文][日本語]
+ 翻訳 [中文][日本語][한국어]
### シンタックスハイライト
diff --git a/doc/README-ko.md b/doc/README-ko.md
index 50fd5920..c67c037d 100644
--- a/doc/README-ko.md
+++ b/doc/README-ko.md
@@ -14,7 +14,7 @@
설치 •
커스터마이즈 •
프로젝트 목표와 대안들 •
- 번역 [中文][日本語]
+ 번역 [中文][日本語]
### 문법 강조
From 17382d36b7a56f90c313c3a0de4bf5bb078a2286 Mon Sep 17 00:00:00 2001
From: sharkdp
Date: Sun, 15 Mar 2020 11:13:13 +0100
Subject: [PATCH 04/47] Update dependencies
---
Cargo.lock | 682 ++++++++++++++++++++++++-----------------------------
1 file changed, 302 insertions(+), 380 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 921098ba..7381939c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,15 +2,15 @@
# It is not intended for manual editing.
[[package]]
name = "adler32"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "aho-corasick"
-version = "0.7.6"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -18,7 +18,7 @@ name = "ansi_colours"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -44,25 +44,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "arrayref"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "arrayvec"
-version = "0.4.11"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
name = "assert_cmd"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "doc-comment 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "predicates 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -73,33 +70,33 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "autocfg"
-version = "0.1.6"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "backtrace"
-version = "0.3.35"
+version = "0.3.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "backtrace-sys"
-version = "0.1.31"
+version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -107,9 +104,14 @@ name = "base64"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
+[[package]]
+name = "base64"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "bat"
version = "0.12.1"
@@ -123,7 +125,7 @@ dependencies = [
"content_inspector 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"git2 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -136,22 +138,21 @@ dependencies = [
[[package]]
name = "bincode"
-version = "1.1.4"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "bindgen"
-version = "0.50.0"
+version = "0.50.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -161,24 +162,24 @@ dependencies = [
"peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "bitflags"
-version = "1.1.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "blake2b_simd"
-version = "0.5.7"
+version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -186,15 +187,15 @@ name = "block-buffer"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "block-padding"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -207,21 +208,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "byteorder"
-version = "1.3.2"
+version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "cc"
-version = "1.0.45"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "cexpr"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -229,17 +229,16 @@ dependencies = [
[[package]]
name = "cfg-if"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "chrono"
-version = "0.4.9"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -249,7 +248,7 @@ version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -260,7 +259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -275,18 +274,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "console"
version = "0.10.0"
@@ -295,8 +286,8 @@ dependencies = [
"clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -304,7 +295,7 @@ dependencies = [
[[package]]
name = "constant_time_eq"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -312,7 +303,7 @@ name = "content_inspector"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -320,21 +311,22 @@ name = "crc32fast"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "crossbeam-utils"
-version = "0.6.6"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "deunicode"
-version = "1.0.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -355,7 +347,7 @@ name = "dirs"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -364,15 +356,15 @@ name = "dirs-sys"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "doc-comment"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -448,18 +440,18 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "error-chain"
-version = "0.12.1"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -469,28 +461,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "failure"
-version = "0.1.5"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -500,13 +480,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "flate2"
-version = "1.0.11"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -524,7 +504,7 @@ name = "fxhash"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -537,12 +517,12 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.1.12"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -550,11 +530,11 @@ name = "git2"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"libgit2-sys 0.11.0+0.99.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -567,15 +547,15 @@ name = "hermit-abi"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "humantime"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -585,7 +565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -595,12 +575,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "itertools"
-version = "0.8.0"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -608,17 +588,15 @@ dependencies = [
[[package]]
name = "itoa"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "jobserver"
-version = "0.1.17"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -642,7 +620,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libc"
-version = "0.2.62"
+version = "0.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -650,10 +628,10 @@ name = "libgit2-sys"
version = "0.11.0+0.99.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -661,7 +639,7 @@ name = "libloading"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -670,10 +648,10 @@ name = "libz-sys"
version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -681,7 +659,7 @@ name = "line-wrap"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -694,19 +672,19 @@ name = "liquid"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "deunicode 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "doc-comment 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-compiler 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-derive 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-interpreter 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "liquid-value 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -715,11 +693,11 @@ name = "liquid-compiler"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-interpreter 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "liquid-value 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -731,7 +709,7 @@ dependencies = [
"liquid-compiler 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-interpreter 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "liquid-value 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-quote 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -748,21 +726,21 @@ version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "liquid-value 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "liquid-value"
-version = "0.19.0"
+version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -770,7 +748,7 @@ name = "log"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -785,63 +763,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "memchr"
-version = "2.2.1"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "miniz-sys"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "miniz_oxide"
-version = "0.3.2"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "nodrop"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
[[package]]
name = "nom"
version = "4.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "num-integer"
-version = "0.1.41"
+version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "num-traits"
-version = "0.2.8"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -849,9 +805,9 @@ name = "onig"
version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"onig_sys 69.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -860,9 +816,9 @@ name = "onig_sys"
version = "69.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bindgen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bindgen 0.50.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -887,10 +843,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "pest"
-version = "2.1.2"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ucd-trie 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -898,35 +854,35 @@ name = "pest_derive"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_generator 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "pest_generator"
-version = "2.1.1"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_meta 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "pest_meta"
-version = "2.1.2"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "pkg-config"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -935,16 +891,16 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "predicates"
-version = "1.0.1"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -967,12 +923,12 @@ dependencies = [
[[package]]
name = "proc-macro-hack"
-version = "0.5.9"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -985,7 +941,7 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.2"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -996,7 +952,7 @@ name = "proc-quote"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-quote-impl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1008,14 +964,14 @@ name = "proc-quote-impl"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "quick-error"
-version = "1.2.2"
+version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1028,10 +984,10 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1040,7 +996,7 @@ version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1059,19 +1015,6 @@ name = "rand_core"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "rdrand"
version = "0.4.0"
@@ -1087,29 +1030,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "redox_users"
-version = "0.3.1"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "regex"
-version = "1.3.1"
+version = "1.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "regex-syntax"
-version = "0.6.12"
+version = "0.6.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1122,12 +1064,13 @@ dependencies = [
[[package]]
name = "rust-argon2"
-version = "0.5.1"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "blake2b_simd 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1137,53 +1080,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "ryu"
-version = "1.0.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "safemem"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "same-file"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "serde"
-version = "1.0.99"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "serde_derive"
-version = "1.0.99"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "serde_json"
-version = "1.0.40"
+version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "sha-1"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1204,7 +1147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "smallvec"
-version = "0.6.10"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1224,43 +1167,32 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.5"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "synstructure"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "syntect"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"onig 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"plist 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1279,16 +1211,16 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "termcolor"
-version = "1.0.5"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1296,7 +1228,7 @@ name = "termios"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1310,7 +1242,7 @@ dependencies = [
[[package]]
name = "thread_local"
-version = "0.3.6"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1321,7 +1253,7 @@ name = "time"
version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1338,7 +1270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "ucd-trie"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1351,15 +1283,15 @@ dependencies = [
[[package]]
name = "unicode-normalization"
-version = "0.1.8"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "unicode-segmentation"
-version = "1.3.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1389,7 +1321,7 @@ dependencies = [
[[package]]
name = "url"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1399,7 +1331,7 @@ dependencies = [
[[package]]
name = "vcpkg"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1412,19 +1344,24 @@ name = "version_check"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
+name = "version_check"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
[[package]]
name = "walkdir"
-version = "2.2.9"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "wasi"
-version = "0.7.0"
+version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1432,8 +1369,8 @@ name = "which"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1470,7 +1407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "winapi-util"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1481,15 +1418,6 @@ name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "wincolor"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "xml-rs"
version = "0.8.0"
@@ -1504,47 +1432,47 @@ dependencies = [
]
[metadata]
-"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
+"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
"checksum ansi_colours 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0f302a81afc6a7f4350c04f0ba7cfab529cc009bca3324b3fb5764e6add8b6"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
"checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
"checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
-"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
+"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
"checksum assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6283bac8dd7226470d491bc4737816fea4ca1fba7a2847f2e9097fd6bfb4624c"
"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
-"checksum backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55"
-"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+"checksum backtrace 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)" = "ad235dabf00f36301792cfe82499880ba54c6486be094d1047b02bacb67c14e8"
+"checksum backtrace-sys 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "ca797db0057bae1a7aa2eef3283a874695455cecf08a43bfb8507ee0ebc1ed69"
"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-"checksum bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9f04a5e50dc80b3d5d35320889053637d15011aed5e66b66b37ae798c65da6f7"
-"checksum bindgen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "65a913de3fa2fa95f2c593bb7e33b1be1ce1ce8a83f34b6bb02e6f01400b96cc"
-"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
-"checksum blake2b_simd 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bf775a81bb2d464e20ff170ac20316c7b08a43d11dbc72f0f82e8e8d3d6d0499"
+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
+"checksum bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
+"checksum bindgen 0.50.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cb0e5a5f74b2bafe0b39379f616b5975e08bcaca4e779c078d5c31324147e9ba"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09"
+"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
-"checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af"
-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
-"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68"
+"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+"checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
"checksum console 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6728a28023f207181b193262711102bfbaf47cc9d13bc71d0736607ef8efe88c"
-"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
+"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
"checksum content_inspector 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38"
"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-"checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"
+"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+"checksum deunicode 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307dde1a517939465bc4042b47377284a56cee6160f8066f1f5035eb7b25a3fc"
"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-"checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"
+"checksum doc-comment 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "807e5847c39ad6a11eac66de492ed1406f76a260eb8656e8740cad9eabc69c27"
"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
@@ -1555,30 +1483,29 @@ dependencies = [
"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9"
+"checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
"checksum escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d"
-"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
-"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
+"checksum failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b"
"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682"
+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
"checksum git2 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26e07ef27260a78f7e8d218ebac2c72f2c4db50493741b190b6e8eade1da7c68"
"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
"checksum hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
-"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-"checksum jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160"
+"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
+"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
+"checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
+"checksum libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
"checksum libgit2-sys 0.11.0+0.99.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d5d1459353d397a029fb18862166338de938e6be976606bd056cf8f1a912ecf"
"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
@@ -1589,99 +1516,94 @@ dependencies = [
"checksum liquid-derive 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b0faadd0dd1a7cf38390316c36a9a741949462750f9833b794ac6d7de145218"
"checksum liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5c0851812322e87dcf67c2d7e520c3efd8651bd44eb8d0c0246e6dfb94d481"
"checksum liquid-interpreter 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "998e0411b8cb6210bb0729ccbb15abd2a1c8ef7e318c97511ae5a741c817c63e"
-"checksum liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7606ac3743bff9929daff0d0f51f9177ab3ec74520f7f832b8ec595dd96efee"
+"checksum liquid-value 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2f56016187fb289186fccf44a9ae840f7b9ba35a04fd611e591aed2a1f53c265"
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"
-"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10"
-"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
-"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
-"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
+"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
"checksum onig 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4e723fc996fff1aeab8f62205f3e8528bf498bdd5eadb2784d2d31f30077947"
"checksum onig_sys 69.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8d4efbf5f59cece01f539305191485b651acb3785b9d5eef05749f0496514e"
"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-"checksum pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a"
+"checksum pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
-"checksum pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0"
-"checksum pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547"
-"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af"
+"checksum pest_generator 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+"checksum pest_meta 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
"checksum plist 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a9f075f6394100e7c105ed1af73fb1859d6fd14e49d4290d578120beb167f"
-"checksum predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "53e09015b0d3f5a0ec2d4428f7559bb7b3fff341b4e159fedd1d57fac8b939ff"
+"checksum predicates 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030"
"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
-"checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8"
+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"
+"checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
"checksum proc-quote 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fa612543f23fda013e1e6ce30b5285a9d313c6e582e57b4ceca74eb5b85685b5"
"checksum proc-quote-impl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f785f0f8cd00b7945efc3f3bdf8205eb06af5aacec598d83e67f41dc8d101fda"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
-"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
+"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
+"checksum regex 1.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8900ebc1363efa7ea1c399ccc32daed870b4002651e0bed86e72d501ebbe0048"
+"checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
+"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
-"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
-"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
-"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"
-"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425"
-"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
-"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
+"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76"
+"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25"
+"checksum sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
"checksum shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a"
"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
+"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
-"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
+"checksum syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
"checksum syntect 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "955e9da2455eea5635f7032fc3a229908e6af18c39600313866095e07db0d8b8"
"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
-"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
+"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
-"checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2"
+"checksum ucd-trie 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
-"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
-"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
+"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
"checksum wild 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "97d34fecce28871e5c0e059deae21ef7f7d13b98a5964b24c58b3735c8052fc8"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
From 3c1dd8558d50e2c44e0e4c30907f8e139e89c8f6 Mon Sep 17 00:00:00 2001
From: sharkdp
Date: Sun, 15 Mar 2020 12:03:25 +0100
Subject: [PATCH 05/47] Update links
---
.github/FUNDING.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index d0f4090f..6cca0684 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,4 @@
# These are supported funding model platforms
github: sharkdp
+custom: ["https://paypal.me/sharkfishsoftware"]
From a2075b0f24b458e029495bb7f3b45bb40badef79 Mon Sep 17 00:00:00 2001
From: sharkdp
Date: Sun, 15 Mar 2020 14:18:04 +0100
Subject: [PATCH 06/47] Update git dependency
---
Cargo.lock | 12 ++++++------
Cargo.toml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 7381939c..5e52b40d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -126,7 +126,7 @@ dependencies = [
"dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "git2 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "git2 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -527,12 +527,12 @@ dependencies = [
[[package]]
name = "git2"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
- "libgit2-sys 0.11.0+0.99.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libgit2-sys 0.12.0+0.99.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -625,7 +625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libgit2-sys"
-version = "0.11.0+0.99.0"
+version = "0.12.0+0.99.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1493,7 +1493,7 @@ dependencies = [
"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-"checksum git2 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26e07ef27260a78f7e8d218ebac2c72f2c4db50493741b190b6e8eade1da7c68"
+"checksum git2 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b7da16ceafe24cedd9ba02c4463a2b506b6493baf4317c79c5acb553134a3c15"
"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
"checksum hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
@@ -1506,7 +1506,7 @@ dependencies = [
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
"checksum libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
-"checksum libgit2-sys 0.11.0+0.99.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d5d1459353d397a029fb18862166338de938e6be976606bd056cf8f1a912ecf"
+"checksum libgit2-sys 0.12.0+0.99.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05dff41ac39e7b653f5f1550886cf00ba52f8e7f57210b633cdeedb3de5b236c"
"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
"checksum line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
diff --git a/Cargo.toml b/Cargo.toml
index 149bd3d1..b664138c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ shell-words = "0.1.0"
unicode-width = "0.1.7"
[dependencies.git2]
-version = "0.12"
+version = "0.13"
default-features = false
features = []
From b611d2aef4056c318e460bd12ad3de6b4014d6cb Mon Sep 17 00:00:00 2001
From: sharkdp
Date: Sun, 15 Mar 2020 14:14:01 +0100
Subject: [PATCH 07/47] Add no-duplicate-extensions unit test
---
tests/no_duplicate_extensions.rs | 35 ++++++++++++++++++++++++++++++++
tests/syntax_detection.rs | 11 ++++++++++
2 files changed, 46 insertions(+)
create mode 100644 tests/no_duplicate_extensions.rs
diff --git a/tests/no_duplicate_extensions.rs b/tests/no_duplicate_extensions.rs
new file mode 100644
index 00000000..ef9e76a9
--- /dev/null
+++ b/tests/no_duplicate_extensions.rs
@@ -0,0 +1,35 @@
+use std::collections::HashSet;
+
+use bat::assets::HighlightingAssets;
+
+#[test]
+fn no_duplicate_extensions() {
+ const KNOWN_EXCEPTIONS: &[&'static str] = &[
+ // The '.h' extension currently appears in multiple syntaxes: C, C++, Objective C,
+ // Objective C++
+ "h",
+ // In addition to the standard Haskell syntax in 'Packages', we also ship the 'Cabal'
+ // syntax which comes with a "Haskell (improved)" syntax.
+ "hs",
+ // In addition to the standard JavaScript syntax in 'Packages', we also ship the
+ // 'Javascript (Babel)' syntax.
+ "js",
+ // The "Ruby Haml" syntax also comes with a '.sass' extension. However, we make sure
+ // that 'sass' is mapped to the 'Sass' syntax.
+ "sass",
+ ];
+
+ let assets = HighlightingAssets::new();
+
+ let mut extensions = HashSet::new();
+
+ for syntax in assets.syntax_set.syntaxes() {
+ for extension in &syntax.file_extensions {
+ assert!(
+ KNOWN_EXCEPTIONS.contains(&extension.as_str()) || extensions.insert(extension),
+ "File extension / pattern \"{}\" appears twice in the syntax set",
+ extension
+ );
+ }
+ }
+}
diff --git a/tests/syntax_detection.rs b/tests/syntax_detection.rs
index 23a52de9..ac155959 100644
--- a/tests/syntax_detection.rs
+++ b/tests/syntax_detection.rs
@@ -57,6 +57,17 @@ fn syntax_detection_basic() {
assert_eq!(test.syntax_name("PKGBUILD"), "Bourne Again Shell (bash)");
}
+#[test]
+fn syntax_detection_well_defined_mapping_for_duplicate_extensions() {
+ let test = SyntaxDetectionTest::new();
+
+ assert_eq!(test.syntax_name("test.sass"), "Sass");
+ // TODO: make these tests pass:
+ // assert_eq!(test.syntax_name("test.h"), "C");
+ // assert_eq!(test.syntax_name("test.hs"), "Haskell (Improved)");
+ // assert_eq!(test.syntax_name("test.js"), "JavaScript (Babel)");
+}
+
#[test]
fn syntax_detection_first_line() {
let test = SyntaxDetectionTest::new();
From 439be036345fa4475645698df854be89f9fbbe44 Mon Sep 17 00:00:00 2001
From: sharkdp
Date: Sun, 15 Mar 2020 14:20:40 +0100
Subject: [PATCH 08/47] Remove duplicate F# syntax
---
assets/syntaxes/FSharp.sublime-syntax | 672 --------------------------
1 file changed, 672 deletions(-)
delete mode 100644 assets/syntaxes/FSharp.sublime-syntax
diff --git a/assets/syntaxes/FSharp.sublime-syntax b/assets/syntaxes/FSharp.sublime-syntax
deleted file mode 100644
index d7fb5257..00000000
--- a/assets/syntaxes/FSharp.sublime-syntax
+++ /dev/null
@@ -1,672 +0,0 @@
-%YAML 1.2
----
-# http://www.sublimetext.com/docs/3/syntax.html
-name: "F#"
-file_extensions:
- - fs
- - fsi
- - fsx
-scope: source.fsharp
-contexts:
- main:
- - include: compiler_directives
- - include: comments
- - include: constants
- - include: strings
- - include: chars
- - include: double_tick
- - include: definition
- - include: abstract_definition
- - include: attributes
- - include: modules
- - include: anonymous_functions
- - include: du_declaration
- - include: record_declaration
- - include: records
- - include: strp_inlined
- - include: keywords
- - include: cexprs
- - include: text
- abstract_definition:
- - match: '\b(abstract)\s+(member)?(\s+\[\<.*\>\])?\s*([_[:alpha:]0-9,\._`\s]+)(:)'
- captures:
- 1: keyword.fsharp
- 2: keyword.fsharp
- 3: support.function.attribute.fsharp
- 5: keyword.fsharp
- push:
- - meta_scope: abstract.definition.fsharp
- - match: \s*(with)\b|=|$
- captures:
- 1: keyword.fsharp
- pop: true
- - include: comments
- - include: common_declaration
- - match: '(\?{0,1})([[:alpha:]0-9''`^._ ]+)\s*(:)(\s*([[:alpha:]0-9''`^._ ]+)){0,1}'
- captures:
- 1: keyword.symbol.fsharp
- 2: variable.parameter.fsharp
- 3: keyword.symbol.fsharp
- 4: entity.name.type.fsharp
- - match: '(?!with|get|set\b)\b([\w0-9''`^._]+)'
- captures:
- 1: entity.name.type.fsharp
- - include: keywords
- anonymous_functions:
- - match: \b(fun)\b
- captures:
- 1: keyword.fsharp
- push:
- - meta_scope: function.anonymous
- - match: (->)
- captures:
- 1: keyword.fsharp
- pop: true
- - include: comments
- - match: (\()
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: \s*(?=(->))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: member_declaration
- - include: variables
- attributes:
- - match: '\[\<'
- push:
- - meta_scope: support.function.attribute.fsharp
- - match: '\>\]|\]'
- pop: true
- - include: main
- cexprs:
- - match: '\b(async|seq|promise|task|maybe|asyncMaybe|controller|scope|application|pipeline)\s*\{'
- scope: cexpr.fsharp
- captures:
- 0: keyword.fsharp
- chars:
- - match: ('\\?.')
- scope: char.fsharp
- captures:
- 1: string.quoted.single.fsharp
- comments:
- - match: (\(\*(?!\)))
- captures:
- 1: comment.block.fsharp
- push:
- - meta_scope: comment.block.fsharp
- - match: (\*\))
- captures:
- 1: comment.block.fsharp
- pop: true
- - match: //.*$
- scope: comment.line.double-slash.fsharp
- common_binding_definition:
- - include: comments
- - include: attributes
- - match: (:)\s*(\()\s*(static member|member)
- captures:
- 1: keyword.symbol.fsharp
- 2: keyword.symbol.fsharp
- 3: keyword.fsharp
- push:
- - match: (\))\s*((?=,)|(?=\=))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: '(\^[[:alpha:]0-9''._]+)'
- captures:
- 1: entity.name.type.fsharp
- - include: variables
- - include: keywords
- - match: (:)\s*(\()
- captures:
- 1: keyword.symbol.fsharp
- 2: keyword.symbol.fsharp
- push:
- - match: '(\)\s*(([?[:alpha:]0-9''`^._ ]*)))'
- captures:
- 1: keyword.symbol.fsharp
- 2: entity.name.type.fsharp
- pop: true
- - include: tuple_signature
- - match: '(:)\s*(\^[[:alpha:]0-9''._]+)\s*(when)'
- captures:
- 1: keyword.symbol.fsharp
- 2: entity.name.type.fsharp
- 3: keyword.fsharp
- push:
- - match: (?=:)
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: \b(and|when|or)\b
- scope: keyword.fsharp
- - match: "([[:alpha:]0-9'^._]+)"
- comment: Because we first capture the keywords, we can capture what looks like a word and assume it's an entity definition
- captures:
- 1: entity.name.type.fsharp
- - match: (\(|\))
- scope: keyword.symbol.fsharp
- - match: '(:)\s*([?[:alpha:]0-9''`^._ ]+)'
- captures:
- 1: keyword.symbol.fsharp
- 2: entity.name.type.fsharp
- - match: '(->)\s*(\()?\s*([?[:alpha:]0-9''`^._ ]+)*'
- captures:
- 1: keyword.symbol.fsharp
- 2: keyword.symbol.fsharp
- 3: entity.name.type.fsharp
- - match: (\*)\s*(\()
- captures:
- 1: keyword.symbol.fsharp
- 2: keyword.symbol.fsharp
- push:
- - match: '(\)\s*(([?[:alpha:]0-9''`^._ ]+))+)'
- captures:
- 1: keyword.symbol.fsharp
- 2: entity.name.type.fsharp
- pop: true
- - include: tuple_signature
- - match: '(\*)(\s*([?[:alpha:]0-9''`^._ ]+))*'
- captures:
- 1: keyword.symbol.fsharp
- 2: entity.name.type.fsharp
- - match: '(<(?![[:space:]]*\)))'
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: ((?)
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: generic_declaration
- - match: "({)"
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: "(})"
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: record_signature
- - include: definition
- - include: variables
- - include: keywords
- common_declaration:
- - match: '\s*(->)\s*([[:alpha:]0-9''`^._ ]+)(<)'
- captures:
- 1: keyword.symbol.fsharp
- 2: entity.name.type.fsharp
- 3: keyword.symbol.fsharp
- push:
- - match: (>)
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: "([[:alpha:]0-9'`^._ ]+)"
- captures:
- 1: entity.name.type.fsharp
- - include: keywords
- - match: '\s*(->)\s*(?!with|get|set\b)\b([\w0-9''`^._]+)'
- captures:
- 1: keyword.symbol.fsharp
- 2: entity.name.type.fsharp
- - match: '(\?{0,1})([[:alpha:]0-9''`^._ ]+)\s*(:)(\s*([?[:alpha:]0-9''`^._ ]+)(<))'
- captures:
- 1: keyword.symbol.fsharp
- 2: variable.parameter.fsharp
- 3: keyword.symbol.fsharp
- 4: keyword.symbol.fsharp
- 5: entity.name.type.fsharp
- push:
- - match: (>)
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: "([[:alpha:]0-9'`^._ ]+)"
- captures:
- 1: entity.name.type.fsharp
- - include: keywords
- compiler_directives:
- - match: \s?(#if|#elif|#else|#elseif|#endif|#light|#nowarn)
- scope: compiler_directive.fsharp
- captures:
- constants:
- - match: \(\)
- scope: constant.language.unit.fsharp
- - match: '\b-?[0-9][0-9_]*((\.([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))'
- scope: constant.numeric.floating-point.fsharp
- - match: '\b(-?((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(0(o|O)[0-7][0-7_]*)|(0(b|B)[01][01_]*)|([0-9][0-9_]*)))'
- scope: constant.numeric.integer.nativeint.fsharp
- - match: \b(true|false|null|unit)\b
- scope: constant.others.fsharp
- definition:
- - match: '\b(let mutable|static let mutable|let inline|let|member val|static member inline|static member|default|member|override|let!)(\s+rec|mutable)?(\s+\[\<.*\>\])?\s*(private|internal|public)?\s+(\[[^-=]*\]|[_[:alpha:]]([_[:alpha:]0-9,\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\._`\s]+|(?<=,)\s)*)?'
- captures:
- 1: keyword.fsharp
- 2: keyword.fsharp
- 3: support.function.attribute.fsharp
- 4: keyword.fsharp
- 5: variable.fsharp
- push:
- - meta_scope: binding.fsharp
- - match: \s*(with\b|=|\n+=|(?<=\=))
- captures:
- 1: keyword.fsharp
- pop: true
- - include: common_binding_definition
- - match: '\b(static val mutable|val mutable|val)(\s+rec|mutable)?(\s+\[\<.*\>\])?\s*(private|internal|public)?\s+(\[[^-=]*\]|[_[:alpha:]]([_[:alpha:]0-9,\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\._`\s]+|(?<=,)\s)*)?'
- captures:
- 1: keyword.fsharp
- 2: keyword.fsharp
- 3: support.function.attribute.fsharp
- 4: keyword.fsharp
- 5: variable.fsharp
- push:
- - meta_scope: binding.fsharp
- - match: \n$
- pop: true
- - include: common_binding_definition
- double_tick:
- - match: (``)(.*)(``)
- scope: variable.other.binding.fsharp
- captures:
- 1: string.quoted.single.fsharp
- 2: variable.other.binding.fsharp
- 3: string.quoted.single.fsharp
- du_declaration:
- - match: \b(of)\b
- captures:
- 1: keyword.fsharp
- push:
- - meta_scope: du_declaration.fsharp
- - match: $|(\|)
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: comments
- - match: '([[:alpha:]0-9''`<>^._]+|``[[:alpha:]0-9'' <>^._]+``)\s*(:)\s*([[:alpha:]0-9''`<>^._]+|``[[:alpha:]0-9'' <>^._]+``)'
- captures:
- 1: variable.parameter.fsharp
- 2: keyword.symbol.fsharp
- 3: entity.name.type.fsharp
- - match: "([[:alpha:]0-9'`^._]+)|``([[:alpha:]0-9'^._ ]+)``"
- captures:
- 1: entity.name.type.fsharp
- - include: keywords
- generic_declaration:
- - match: (:)\s*(\()\s*(static member|member)
- captures:
- 1: keyword.symbol.fsharp
- 2: keyword.symbol.fsharp
- 3: keyword.fsharp
- push:
- - match: (\))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: (\()
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: (\))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: member_declaration
- - match: '((''|\^)[[:alpha:]0-9''._]+)'
- captures:
- 1: entity.name.type.fsharp
- - include: variables
- - include: keywords
- - match: \b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\!|return\!|return|interface|with|abstract|property|union|enum|member|try|finally|and|when|use|use\!|struct|while|mutable)(?!')\b
- scope: keyword.fsharp
- - match: ":"
- scope: keyword.fsharp
- - include: constants
- - match: '((''|\^)[[:alpha:]0-9''._]+)'
- captures:
- 1: entity.name.type.fsharp
- - match: (<)
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: (>)
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: '((''|\^)[[:alpha:]0-9''._]+)'
- captures:
- 1: entity.name.type.fsharp
- - include: tuple_signature
- - include: generic_declaration
- - match: '(?!when|and|or\b)\b([\w0-9''`^._]+)'
- captures:
- 1: entity.name.type.fsharp
- - match: (\|)
- captures:
- 1: keyword.symbol.fsharp
- - include: keywords
- keywords:
- - match: \b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\!|return\!|return|interface|with|abstract|property|union|enum|member|try|finally|and|when|or|use|use\!|struct|while|mutable)(?!')\b
- scope: keyword.fsharp
- - match: '(&&&|\|\|\||\^\^\^|~~~|<<<|>>>|\|>|\->|\<\-|:>|:\?>|:|\[|\]|\;|<>|=|@|\|\||&&|{|}|\||_|\.\.|\,|\+|\-|\*|\/|\^|\!|\>|\>\=|\>\>|\<|\<\=|\(|\)|\<\<)'
- scope: keyword.symbol.fsharp
- member_declaration:
- - include: comments
- - include: common_declaration
- - match: (:)\s*(\()\s*(static member|member)
- captures:
- 1: keyword.symbol.fsharp
- 2: keyword.symbol.fsharp
- 3: keyword.fsharp
- push:
- - match: (\))\s*((?=,)|(?=\=))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: (\()
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: (\))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: member_declaration
- - match: '(\^[[:alpha:]0-9''._]+)'
- captures:
- 1: entity.name.type.fsharp
- - include: variables
- - include: keywords
- - match: '(\^[[:alpha:]0-9''._]+)'
- captures:
- 1: entity.name.type.fsharp
- - match: \b(and|when|or)\b
- scope: keyword.fsharp
- - match: (\(|\))
- scope: keyword.symbol.fsharp
- - match: '(\?{0,1})([[:alpha:]0-9''`^._]+|``[[:alpha:]0-9''`^:,._ ]+``)\s*(:{0,1})(\s*([?[:alpha:]0-9''`<>._ ]+)){0,1}'
- captures:
- 1: keyword.symbol.fsharp
- 2: variable.parameter.fsharp
- 3: keyword.symbol.fsharp
- 4: entity.name.type.fsharp
- - include: keywords
- modules:
- - match: '\b(namespace|module)\s*(public|internal|private)?\s+([[:alpha:]][[:alpha:]0-9''_. ]*)'
- captures:
- 1: keyword.fsharp
- 2: keyword.fsharp
- 3: entity.name.section.fsharp
- push:
- - meta_scope: entity.name.section.fsharp
- - match: (\s?=|\s|$)
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: '(\.)([A-Z][[:alpha:]0-9''_]*)'
- scope: entity.name.section.fsharp
- captures:
- 1: punctuation.separator.namespace-reference.fsharp
- 2: entity.name.section.fsharp
- - match: '\b(open)\s+([[:alpha:]][[:alpha:]0-9''_]*)(?=(\.[A-Z][[:alpha:]0-9_]*)*)'
- captures:
- 1: keyword.fsharp
- 2: entity.name.section.fsharp
- push:
- - meta_scope: namespace.open.fsharp
- - match: (\s|$)
- pop: true
- - match: '(\.)([[:alpha:]][[:alpha:]0-9''_]*)'
- scope: entity.name.section.fsharp
- captures:
- 1: punctuation.separator.namespace-reference.fsharp
- 2: entity.name.section.fsharp
- - match: '^\s*(module)\s+([A-Z][[:alpha:]0-9''_]*)\s*(=)\s*([A-Z][[:alpha:]0-9''_]*)'
- captures:
- 1: keyword.fsharp
- 2: entity.name.type.namespace.fsharp
- 3: punctuation.separator.namespace-definition.fsharp
- 4: entity.name.section.fsharp
- push:
- - meta_scope: namespace.alias.fsharp
- - match: (\s|$)
- pop: true
- - match: '(\.)([A-Z][[:alpha:]0-9''_]*)'
- scope: entity.name.section.fsharp
- captures:
- 1: punctuation.separator.namespace-reference.fsharp
- 2: entity.name.section.fsharp
- record_declaration:
- - match: '(\{)'
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: '(?<=\})'
- pop: true
- - include: comments
- - match: '(((mutable)\s[[:alpha:]]+)|[[:alpha:]0-9''`<>^._]*)\s*((?)
- captures:
- 1: keyword.fsharp
- pop: true
- - match: '((''|\^)``[[:alpha:]0-9`^:,._ ]+``|(''|\^)[[:alpha:]0-9`^:._]+)'
- captures:
- 1: entity.name.type.fsharp
- - match: \b(interface|with|abstract|and|when|or|not|struct|equality|comparison|unmanaged|delegate|enum)\b
- scope: keyword.fsharp
- - match: (\()
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: (\))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: (static member|member|new)
- captures:
- 1: keyword.fsharp
- - include: common_binding_definition
- - match: '([\w0-9''`^._]+)'
- captures:
- 1: entity.name.type.fsharp
- - include: keywords
- - match: \s*(private|internal|public)
- captures:
- 1: keyword.symbol.fsharp
- 2: keyword.fsharp
- - match: (\()
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: '\s*(?=(=)|[\n=]|(\(\))|(as))'
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: member_declaration
- - include: keywords
- string_formatter:
- - match: (%0?-?(\d+)?((a|t)|(\.\d+)?(f|F|e|E|g|G|M)|(b|c|s|d|i|x|X|o|u)|(s|b|O)|(\+?A)))
- scope: entity.name.type.format.specifier.fsharp
- captures:
- 1: keyword.format.specifier.fsharp
- strings:
- - match: '(?=[^\\])(@")'
- captures:
- 1: punctuation.definition.string.begin.fsharp
- push:
- - meta_scope: string.quoted.literal.fsharp
- - match: (")(?!")
- captures:
- 1: punctuation.definition.string.end.fsharp
- pop: true
- - match: '"(")'
- scope: constant.character.string.escape.fsharp
- - match: '(?=[^\\])(""")'
- captures:
- 1: punctuation.definition.string.begin.fsharp
- push:
- - meta_scope: string.quoted.triple.fsharp
- - match: (""")
- captures:
- 1: punctuation.definition.string.end.fsharp
- pop: true
- - include: string_formatter
- - match: '(?=[^\\])(")'
- captures:
- 1: punctuation.definition.string.begin.fsharp
- push:
- - meta_scope: string.quoted.double.fsharp
- - match: (")
- captures:
- 1: punctuation.definition.string.end.fsharp
- pop: true
- - match: '\\$[ \t]*'
- scope: punctuation.separator.string.ignore-eol.fsharp
- - match: '\\([\\''''ntbr]|u[a-fA-F0-9]{4}|u[a-fA-F0-9]{8})'
- scope: constant.character.string.escape.fsharp
- - match: '\\(?![\\''''ntbr]|u[a-fA-F0-9]{4}|u[a-fA-F0-9]{8}).'
- scope: invalid.illeagal.character.string.fsharp
- - include: string_formatter
- strp_inlined:
- - match: (\()
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: (\))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: strp_inlined_body
- strp_inlined_body:
- - include: comments
- - include: anonymous_functions
- - match: '(\^[[:alpha:]0-9''._]+)'
- captures:
- 1: entity.name.type.fsharp
- - match: \b(and|when|or)\b
- scope: keyword.fsharp
- - match: (\()
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: (\))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - include: strp_inlined_body
- - match: '(static member|member)\s*([[:alpha:]0-9''`<>^._]+|``[[:alpha:]0-9'' <>^._]+``)\s*(:)'
- captures:
- 1: keyword.fsharp
- 2: variable.fsharp
- 3: keyword.symbol.fsharp
- - include: compiler_directives
- - include: constants
- - include: strings
- - include: chars
- - include: double_tick
- - include: keywords
- - include: text
- - include: definition
- - include: attributes
- - include: keywords
- - include: cexprs
- - include: text
- text:
- - match: \\
- scope: text.fsharp
- tuple_signature:
- - match: "(([?[:alpha:]0-9'`^._ ]+))+"
- captures:
- 1: entity.name.type.fsharp
- - match: (\()
- captures:
- 1: keyword.symbol.fsharp
- push:
- - match: (\))
- captures:
- 1: keyword.symbol.fsharp
- pop: true
- - match: "(([?[:alpha:]0-9'`^._ ]+))+"
- captures:
- 1: entity.name.type.fsharp
- - include: tuple_signature
- - include: keywords
- variables:
- - match: \(\)
- scope: constant.language.unit.fsharp
- - match: '(\?{0,1})(``[[:alpha:]0-9''`^:,._ ]+``|[[:alpha:]0-9''`<>^._ ]\w*)'
- captures:
- 1: keyword.symbol.fsharp
- 2: variable.parameter.fsharp
From 916c1e435916f747b97955f1113d360a17a519af Mon Sep 17 00:00:00 2001
From: sharkdp
Date: Sun, 15 Mar 2020 14:20:56 +0100
Subject: [PATCH 09/47] Update assets
---
assets/syntaxes.bin | Bin 575090 -> 632202 bytes
assets/themes.bin | Bin 10247 -> 16785 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/assets/syntaxes.bin b/assets/syntaxes.bin
index 82569b611e50f4b1bc32615d15ef80b48c249ddc..9992cb8117b293db6f14b54a1ea883ac062d4768 100644
GIT binary patch
literal 632202
zcmWhz18`(b7mclnZQHh;Ow5g)Y;4=MZ9Cc6wm195+1Td(^H0^Asp>j&?!DdhUY~dR
zdi}oagUuow1BlR*r9edGjYLNL0dilNJj(+0(*U=6-La~5pp_Yky2=l_TJhmg8d
zlzR$1G#(1U7;-!)y2Ckv_k?qv@8q$DU$N>cKR^86Ki?bwLTH}tm8XjWlr_-j>_3dx
z0lEWEhn=Pv2ZGt;bIE-Uxlb*b8gvcl`#g4X8n1tp_JMb`7vW%EU<(@!_*g90{$niS
zFJu6w{v+}nC^N5C#Sp_9&6dA}x7n=0;~hSCH5M}Po(l(~1o5L-K8iN;m`lTnt9-G0`o+`keFw4Rm^a
zddxV}pE<+Zj9RGZjj%pDf=cWH>{&Ke@h#a3=CJY8Zo^JVD={|Ps_T(So96D5DI$5V
zur+6_Vkz0gRcW>sv{WBXYJ*zMyZCZx)0SgZ8T2wq_72=KkqYU5k`b=cJ}EJD>#$~H
z(w}Pftk>_e#qNl1^ezu*6j9t~{HZ?7va
zzobl2q0pX|j|5>y*I
zHNk8iwW?YJG%uUfZ(e0IoublO0YNIV$MG{tINwIA7@gSSy=;%++|(bOewgy`or6
zYBRa%;gop$+`nYW6c#Y9SA=wJw%5eawje{JLz3&$(7V-;kF*-n76{UzRNhR%h3id7
z_d;FxP~Cy8Qdtkt-(cxIVXMC!Ox46NS*V~I*BB}KoI=+-^PKdG;tfc96Y6Qg54(~u
zsUWfC$5ISozV*obR8-YQ*!mJ!QAgN2a4dWQXA2NPYVM15b@qh8$ch;}+JGI4AiZQU
zm)h`?J9<;za=WNk{obFN+os#xi2iTDYIJ$%g^Yx!masB>Yn;Eh>BCSryKPYkCJvGl
zx9^}|L&=FI;S#e=v?VtCxKmu_1kh!pnEL@!F50ibl(buAT_{v`ZQsJ*=+lyZz*-da4c=Xkk@S;pt9gc
zf$FpQ`QxiieWAx?zGO%DirsUs{zZ2z6!Nre9WjtUs3Jm)-Neb8m$Qu3yxnXT;a
z?B%N$t=cUgB`#eY^{rSbG;Z{IT%5-uAs<~@YjPf!vF6FkGt3|UDPuZ)dFrbFMPWG`y%i==5rzfiescR0t)hwhb+}E2cc}hcVze}U#)3~kFYsJNhhB8
zcG)URNL1MlW=UT)9i;_lc-cpeIDg9=d)hRYMA@8WRKmAq)O@gIRKt*E)X!Qx(`$=4
zvUl{1qHOgwBn=1k&$5hlC*r4hT4laFa^07L-LmxyEHKcW1sVq
zwK3!g{JDzNw9)e0O{zq*6WWQTT@Tg;&VNCp%^pH{861KsBCe)tBa8yb%H~|NXz`(C
z?{m|e<&Zuq;14NZuQi>Mf3Ha*-`X3sGd>G#NT#&gQA|}|kWZamtR3lf8`K2d{t~M;
z`mbueu_H=*S8}{(q5i-yq0&WqO;$r@rlK!iP0+h1e>9xPV~zbPH>w{d29}ajHID}|
zL?iP3fvPmdY|3SdUdxeeDFjC+m;Sk)ve3J9VRpMSIk7pIRMsP^(bAY}hZ#;i6s$E$
zVnqOR`mcVNenJm|6vjBG)_Q;HYKV-ioBN~gS`U5-@(Qz_C*n=$`IH33OVT|YK>dXq
z>9h>b6{|HQ0R4n&)V2hXyn5^WP7s(=cjd
z`;!~YEVGLyNK1fX`kQ387G0+OLjXAMFO*5MR(lE{ZK5C=q$O%xF9VAGq8E=zH)$MQ
z7b-WS7`QBMxB-MTTfPAPx7Ed`<&dLQz2MO@mNicAN~d<|4RcSu0R-kA5pKFwK{3?1)w+Lm
zTD4pt^zqNuJCLWOcK`>tvzthJLqa>Vt(p0Pigo-&p;l1W`vP>nlehl!oOdp(DXzP(
zq>fqj4_fz+qH6@aS{fMNe|8s@-cmk0n*L@Wl-&_-^Mjq>9Oy?s=mU7=3%51R;>A0z@K
zuT-X8pvfFNxjFOKkn)0?{kIM%Huv0RI+Bsr!<^>oIcs7gu5Tj~pMl
z@&U*Z$A$iVPc8Iz^QvHfwB8ND%;YrFzWP=
zbjrs?jUuMwMp832TzAk98Po84>ua^}7+0t}kWyE`xFm)SdW8sAY?WF?Bbso#uEmY2
z2xV}ZM=Gd7EvX>ycT$;BZdHwGv1|01V?*ZIRH&(OcTNQjYC#n`B!oUM9AZG`%t!
zoJtxEYBcl;3RV+_1Z#H@5+j&D_a?DjZ#-cIqy3T}Y9gtvjG~77v5c~Y$FWSZsa5)z
zOr;FsGMiY+;xmRn)vH!{9#73*HjEJ=k&Dm-D#ckrJO)CUW#aSnghJeFjF7%1_z-Lz
z+$o=Ij0^Ik?@K!xC8S#VO}RYAPiojtbY78dY59Z~S`Jx&vk~?lW{Sc9B40Yp{YUtU
ztT$V7ApcYz=CRf4N2{%{tEo=dJrxjsySF!@w*4}@?3Yx_Z@D)FM=gz3{6*H%RylU_
zAM-i5*HC>HWpTRi^)ZG@Nm|$uMFv?C^otUEnG4kHDpXsk5Uzeu(yZ;$>~!V))YMYu
z6v?kPDH~#T#;mA;nzTaZyY<_xD`(q?7NqVXLEK%Q6_q~;OolK+Cz0f<+RhmR>5uno$RHtF`D;vGN4lr^VPSx
zk@P$WK2gW>xkcRcMf`k~M_;uq8z*E9hGcBA!-Pdr`Fb3bZ|tY2;@2nYa&YA~v={^i
zxX$Mt9SjqPOTC4#b|@^Gn47al-OK9X(G{asXP?4+i}m=xlB75)T7BsVhHM%=U{KPzq}x@P;Jt#E<}(M6@9VbtU_Q
zL~8A4R7u6pxRQ!a(6-kBO1Kl0aEA=A$1$d4zK<`4|0W|U!~BE$Z)Dt2H5T?2~>ZP0ia_i
zN`^G%_frEXnI2G)BylD4+W=tFe*zRC9yBB|CAO$CKy?t~*?+**1R)T6A81NsKy@Zc
z15f&CKng3+5VADd;SL%RH_iD)Q5st
zIDVElKTJ(uvX~qnwwRm%x|rX0L$tOhk)Y&B5=uM<2&M8rl0mDJ$W8oICcNI2q&}6%
zlfa#>7(gCVs<_r?MfO=AOIJ{4+QZ~fcOg~(N4ZOLwIkj;uRVnPU0awr~?6Fs{wdo
zieL00S>NtZ&4)aI(fM6zw4MMQvCD6NDCcVu@~DUJ&928^->baF+V=~fhdB$V03%QV
z15#)L-^8E*GN1s3pa6kVpa24(03x6O9|NEOG{ct%Cie`})$ddl1XPuYLFSVC|a$xJxuCW--RXC)K)l_jh|pSMv*RGe)_Xx
zB(i)%NbZJk5r>1&ebR%*hGSXt4g)}UXsuq^kI_H0WHmA(3OMFiNQ=lQO=QfUo-EfK
zKI$0_9Rxv#LGleAK7~);w!5IvCxT;hfgLHpG}b@JIz;!4vu6I_X3+f65(_`hXzIHD
zAnja4U3=lD_6`wRIHGG8#zms%Q+sQAGvJnt`rn
zl1y1H|Dk6{dh24jX@`V^5Yh?0LjU)(q9w#U6c|c==}s@YHTg5c!abS(y9Ib$YoSFS
z3L9gC1$|VT`?MbeT(`r9tfS6{ob)z?3pZ|WAafu#`H_ksu|Z#?LuxO>_N-D)-oPt*
zdLeg?h96^>50-}u2KN>Rj2OC*3yd<}aSeASkd>Kmnmi|4l}67s$ftE>;yW}A7RcV4
z1qf2jPhLP19P}ZboB#skAic&2tB&Jih;A
zR|}p*P_9w`7vs*RVTV=lgdQ!Hw!VdH5Gk^Cz(wcE8j+-6zsT&uzXjP
z1n(6Bd4i8p{6)rFau6Ngbn~QIq>i^y1Ndiyp86rZ)pF1K;|9v<~Kev0qFP7s-uC&Jej%
zEo6E+b%JywwO_trJaswbWFH1SITD|{#?BU;Ko}`41+xrf1oAa{U5u^kB{6s{8sHo<`%BUZhoPrlxMn+$)!ZCyy%uIyYU8hES
zAt7^Eq`LjOhq|C!vTlVHyeMrJ3P3$R$kV$8%#4veO?tf_|GGE-pAi-yfk
zEXZ}5=g-(l6K{ANR9mZY&Jq%g2m}1aCpcVxTgAtVZ5unb;6iV0zjg55jqeo9-e&i;
zKELQ=fE{W3yk@T;ktGfaa*y_I^_pyZp&Jl?aCamgV3V7lhAiuYRKA0xD7sH|%3-NN
zbM>{ya-a{v!K=rvn$%0j`o)w$R0+d81V@cDFREj7<@j~H8Jvx9qjP2+-@$2C8
zPU+QXFW56*3ot=0h%3#ZU%ynQR2IAUqFDwVZ$NJqFFYC3Q?TTe&pr4nYBxU>6+~oz
z@rf}U+jM38_@>v#E{WfXlw1msXujm%6lajo5A863xy8Sml{s@K$tJ4LU~WT~
z#uC9kW32jBpljSv{K76RL2wX}%gT-^dr2KVnT_FsdVf%-B*X%$q-tPfKOg~_i}p+I
zv0rat;dnSRq!&`q;cg3Ya=!@oMW9oKRaP`!%5f%>%8LiRlhg2FGp1RpXQ3s*{FB1c
zLyjd7h^|J=tucRAv7{y^7Mb=1hE3i?b$kHXVZokeVX));h1ab~znt%{L>2x)(Ve_w
zf6Jw4#@(vBRf*|cRmyRcxqWa*vda2<k6F|A=RimPt$qpSFJf9!QWt$k3`*;cIJg*HG@R5
zim8EJXc!6Z?9GJJ@B_#x^mM3WyQE@TEhQ3Pj{Q~V-hO%_88m|-6CWH>OcS_dVDoNa
zUw)nTE*Y!GU4xb
z5?JSsN*YxIJgUXtOOoO5R&5ARjTQ8(17@|V|DsF9zdE}SsOAjfHLIdihqEihoeJgH
zH0$J2SLs1ERZgwWhmsoTOQlA;8HH4b&KM;Rv)o6iU{&=ghn=qDoXcIUOU}8Q)j>^S
z?Yu~CPNO!IX029hg+{7YD^k(6M30CbY-b86T}bu<>r6h`$XXUJ%pT9?U2ZDVAWx+#xynE2q@ahwG*e
z6E*XE1ow*Mj`oxp=mRe^3EaNyZl<{m0;L$ghc_JmJFi7sP{Z*QPoCrBH
zYkk{?S4i$ve8ivIuh(=9WQuyvD7~7Oi(&jtSI`ym?nr4L)*LlkO`VFWD3jtW$E;4c
z&3K0^SqF$Ix`XtyAz(D&8qW0O4@e#M!kNB&!X5l^1*zNlcrqeBqc2XqunzUQ4h>fXcIWxC|Sx4QKYtwAf3t#(y7`YrL6_h
zw%RgiJ?oNaJsZ+!C;h@9ypD#Fk?sA?g9%3wa3vjVAz8n8L$dlQOH%zLBx$^D%=BIe
z2v+_+b5_jF!0Bz$Yndx(y(tBIJtTt>5rMZn9#!Br#T2YYcMt?w*rk6~75Js9y}^^-
z;)-t1hDJ}5=35Y9F0XAMK}Juf2nz>IX~Paqrc(F|LJxY*Qlq^p2AaukRb@%hUIveI
zk(1t54^@!9W|hxk^!Qwc
z2$y%}v-v?rT&sw10U4%pCF>$J-=YGaf|t80`ybt_a}=gn5^5yD3Oz*#H=nFT0Ui}a
z9@v24Qj!LqdNQvOZ%s<79~ZG$oq^o)Y4cRB92GP44{Ln`&im31i_UrzhA${OH=Cn8
zLjAu?LD6b(o3b~(@^il03|U9`2b~(unmp7)`X=LR%8&QzWQ}piGn_WX@{@=Gjro|c
z6^1y78NYtekvX3h>`AvDAx~$_pi%#*$m|7zDL24+RepL`@?K0aF%7lXGYzS4>xEQy
zGKA~HHPAT5fG__{0GIy{9Wt$7b1RY+?YHLOYblMRUBc4OL|l_UV)p9$JsZ2|Qft>5
zmg0;#N2Z#fJxS6C4NB47lTx>bCME9|PfA{Z9cA~SL-Nslr%X!E4nXd@Uu7%4Pn}8r
znr3)~7F$8{C#!D|E|$fJKhB$=&EgHVxnpfg*Yl|Ip4!hIdrPKXpYf_q)Rg%N$9sXO
z$ETckW%5=DzYnxz9^{-qBVlx*j6JbOx_Y~w43yWzYV&z~FDaN2S@!@n_>y^ID(Gg+
zzj(6dm^ki0s_Q^9QzIVz@U$j{z#HYvj5#-4bkW8?U_V@Y!EqO!JB@ZstXT=a++v%U&
z{tFQhKC_l75%qSo8WAMuCd4i>!;U0uYuc{hu*QEoC*5}W+r+S$CtrWM8OmyOv$>|0
zJ;!^LpW~pFSFA?NXo}LbZ5h?|rJ6!|V-^V=E3ev&_8Vu4^ftamll6;~BbQ1@f0FMK
z-P5Dm;DfWA{hqiT%A3UoziacA?I2PnOn65$Pf)Bp$kS@)BMJe(%@V=+rA!Y|r3m{w
zAO+66wo;aOl*mklA?JnT=t69y?DZWs3Q9+>hFRbL&P4Je2NJ0{aL{l{8Krk_O4q|(
zei70VFaC42DA56P+WY1l;jcvk>wv0a7n=$H)83L&=}yu+q(n7qBnsJ$Wxob9)H3J80G
z3j8zXR%=C(mUcouTeQINv4yi*etP;=ogW?hWj7L2BvnWJFMDlkkXG~xg
zrJXMEUjqg=yk0t3lf9Oy$Al?y#WdHmW%PI)6ApQgWV39Fs~-kCmzK&m9L4gz;j6)R
z%9yEIDUIy@esUe2$}Bx_7Um)H;F!MtsVpinMYbfs-$ce40Q_rO*-y~cz67#z&5*~b
zzWng8s**??BNm01kdoiaQbvj%B3?z-K-Ty#kTsqSvc|0lR``W0HER1zz~!BV-n_vP
zSnN|U(ERcUTkI)~Y`DUn!?h&J`ZsN(9y2E?`{|*2^7m)hf`4n9LZ}h=KTFWl~O*66sgwB}yPXsZrx8?INX8)FWk5
zR%9eo1QI~3#8`6I{QUIWh7*#&p2YZ)c_C(yo#iElyl|&ww+T+If;M`qdMdfE5Ft(j
zVBPqwg5B>@gr+*S4K>w?A^+qZQRIa|STtVH;@H)Qsyv%dZ!LqNSB<{RqfFtAY%^GS
zL$Dr*??KemEq&_}e@0|Lu6*jIA6G-0er~`e-spg7b-JKMXK^`~Z
zzcS3@$C9XBV6PA;!x=GW=OJxIU#`ctA$2c$aea@kDB^*r`YLW>Fu8Eu-h6`a&W3zy
zAJAbyzktEp-I3nD_EyGZ*k!Ud-H|<$5kJY$)4TL(+@4fumP4@PDculwg~VTZ*Igb%@Ve!97UVYq$5Y;_hfiE}AZp<$ARNOD0Jm`j|)q1Z?ap%y}H
z46_o05A}wChn60}3yN9lI?bO3vIeCTzzbszSI>q~_26uo&n?5wmwYa}Q1w?VHh~;~$uV4rtA1?}B1ki$kJ9A`N*iM_8+iq=u
z@nfHjW2eP%Yz=7>B4Sp)u)v_hQLv~(kebyUJh?YMh6YFv`kO>IHe!Zy)l&^6FqF$-R@c(<$WXa~PBkX$UHo3~GA~tt5j!#s<07
zR2+t}St?t$2bg`P`i)yML7OU#-ZX3L$&ezYM~OsaBX0_m5Pp~|vTkh`r-&-ZfP~{@
zg}$&%IG&&6)i2#iZ9Ij8wHpi#Jjtd2dt11hJt+%fN3YjsfTyav{OP`x&^rR$<$QTsa5{ze1XD<_-cZ
zOhf%-x6ny!FJ#N;+su}!G`V}f;y^w+^5rP{Fr;u)(6K*?aSg3wYT`!B=X|f~fEpEJ
z6_knLdK9i+21^^$zLj))J$h~}l+Cb>JA&HKtnPSI`&P*HucW=m;uvV79WEbOW$U^$
zBrYwTw*B$8RarAVpEkDoLxgfSe02pHnIXWTDlkto8PEIPE8oV~1({t%io=+$dFq^xt!m%adG?ooIpGjrUqoPdn25
zb56F7G?tNrpGQQLq}#yLD}aA&(X`y+vCB>R$;wSW=enbQziZfR$MZHR>5MQ36JTKf
z46Srwyx|xA?=1h5etB9!X~goJtGPd7`G2qoYW`E=1Ou-hW^HZM8Z*3kp@lX0Hqm}T
zc#q@fFD#p5tChZeEysqmcC=#?J-=dtksT-n^*X$?;}$*SOSZy6!(HhOh%l@9it2g}
zl>}&WggyVXpjcQNw((J&Qaxb4V0DwRuj=67=6p(OQAOy=Z$|(A9s#}aGas`?&p_>6
z{FiL*phC&luAPmvMhBNTDrK99uCEG*#|v{LG+pLQXnxt3Y<|@&>vDbvdO%0Rg>w6S
z_=85KKqFt%cjQSkraG_^_mydoUuY354qkeES%=)$q9($nm%GA6*SiH&edz)dX
zlDohNs5-~#LMlUghv7mBK)LXIa8DkU+GkK;|N$YMEkA+9LkKv#<2xCEsf%bJwd$T&m~`V1!%Fr?dPG`90E7Ha?EVCCqHqVBAzc
zb6880=PEtusq?%c#5l`J{YZEcmmO>Q$cyN^O#_?cvqhg9>1!m~c;{?okJPusmv8F*
zmiLD@jA91%k9tUP_6^_(T&T^HmVkL7awy=<9#t@Iz4-pMixCn#@2h2jJyV-u=Z+%o
zNHZMcp5*6)ou@sc>P1oo$8VfBz|9302gNQi5+qm5$?Sbj-tlWYzk<*F&zEglgtTD1$HTwJFlZ|Hw_(uOe
zF28evX%y}-tB9r}9y5q`$1$jiej<#l?*y=d|8S%JQ=P9mLbpfCX?lNaKyG`a8u-Ww
zvD*bT@Tl(wDh;iOcqt7D{Mo?leTXD~t#%H*m?CK>l>BIhbJ6=Gohoc2mj1B0Fi{h+
z6H(4gec{!^PynT*{dkJ59V4l}3gEX{5ta29G
z^|tZb?kG`-YbbwM1WU*{o>QUu>}!GmJ$xx(h(SPe8BXfT%SyFGC&tVmXCB3ZwXi9h
z^MHMTiIaz^o>`7ZQc<{)=FX4pu-<1G6=Fi1YNfFjaiK#oMdfOP4JeFjVHmea{
zUT@o2@U|5_q$K{nF|acZJ)}iv%UE!Js}9_vTF}UUt$IkTo*uE_fAgszW^Hkc^yHg-
zb6uzh4BIs1G+>4_3cT9M+W8u}&Cl%t_p=pbTlwiJ0;!GkSrvUX#?`B}2pP%)HO53l
zAJuO65kop_?j6L^7q&u*H9epu>jtfJR%fBS1Eq=TFKd>_?q_f=?9uKFk?
zOx9e6)#3FKvMjb-k`vzb5vK-!Y@-?;K2xS~njwK^j<*4rXf>K%{^
z1N`k?6Wr_f1vWY(ZhkM~_xqN*tV-Sb+?$rmlhX8k-sy_ltH}K*ARUN+7Qq9Dg@zKg%J7o0m(%9Sf@)nC?OHT`C*EB`EI!Y9+jb~D^ss@#Euf@Dw(Ne
z%<@qLMGWO1j>IHts-GSam?)^GY-#azeDY-&nQ_{1MlO{2nHgqf-2jtwv>$eqxf9Wp
zj$sP7=}*t;5F#AZ!a&Z*WY1kieEYt*{+P5X@k{-;UOwZaMryz9rqC{Fuw&bTfFyT+
zw-ww6N^Nb{0r(w}r|uscH3EqjlQON|D^&)K8QDB&h{c^XJB-JUl$;sVLRKicx~{QB
zO7JVT;rCkPp}gV${T2Fu(-=2ZpK1+O?Ilv{RoDryp@E!#>V2!lNQa{q+>O3$0ZSF`
z@z6$N+RFQ~FIXQ-W+k)=ZkM2n@+%IQ$f#I=O*5j;(y3ND-mnzS%nzl
zO(R-kO;(
z1!+1UAa^BstP&CzQryroawjIXE1^vHgHaHUB#iRBN|U=vG6z{NlZox6|C9NRiZEOr
z*c3EK$*wZq=Mo|x$$p<{)>Ea)=l+=*>b`>lJbN)e3!v-P)q|4OUkwW)~TS5r@QSr?eth
zFOzA_{?&BKGqdYz>W!+h$L5w;t8ti`laXT4v+`5X>})J?%2j=@5gq|G9iTT*Rz(;M
zqpFXAn)T_Yg%Cnf;V!J%P#aOaNgVFS)FaMD>8gG00i8
zRe@sb;|bZklLehY1It%$-|YuTi=%chNNW3dgt?!xTpnM#enAF?Xo&XF`jOyecq#pp
zE4ipPKm3q00UxV6mI@7wIei4zedaXz>1g3Z`ZME~mF&AeDKW}a!!A}-=mi??x9;-H
zheA>z1tbZFW2m$Ny@-k%ko<=c>DbuhYdOvo>lh(hYkN(VaARM;q$$n8bEt;dkngHf
zTA0x*8c`bdW`B20Hpy66V3xInhU9=^OvuU>Q4i&rZSfaSZP8wI2Ngji_RtKW{OpjD
zCmerwWdg!41SPT@=^v%s$uUeSuB;+>3YKww4$3}Udk
zCid5f>@{nCAw$G1&{28bn?Q
zUfuD7ktVbm;VqYVHI_xOUp^8F?k9nyZI$^ZkDMq-d7xNi(cn%0|7IEZqN$?X?_5o}
z-5%avnXCWfi7EJDXp0&Q4t@>&N-W1gykQ?$$Vw?9YcbNqwa6?3Lp%{wS;yFMf+Zxl
ze&;b<(pWfDj)89{Cla-oVqif+&3y810&0T;La{v^!kNC)fL!82Ze{y(t9YBULY@lu
z&l0x!hfI+1Jz%SN@$GK*`_C@Ou>D{%fhx{G8BW`{iONDNTRJDTwHVNr)~kMsKc5l-
z9SjB9D=K`+RV%_B!t8P%&hdWoAd>I0H5PnUviBgtT0#qk@UbD~JD0$0eP!x_SLz78IhxWS
zK^*Tefq$tS)*<0PlU}oYI-1E2O=`)5B}3d)`N-nYD<8R+h!WL{H>(RWe(nfEco+!H
z_FQDh@Y?)qvPLBvlkWG=HEa8N){egVdeM%#f_z4e#qw6CTD6-ObP6mP33dl_{aL
zGbC*Bujw;#oG+a+jAz=0l9jtARJKDS{>+$*dNry7F^*7yyfyaAT6ltlTr?6&bO_t|
z^tnrk#Bttxy+J!ehl{22=nPwWPGS<*r=9(mfdq~=8^;;4M&z+=qefkwm
zEV;eFR<@}Tf2X5)-rM2+=X)Q!)Y^NZRz9M$3j;2cE#(iGR|!3#V+2k0blIvWo^|^3
zRL$cwhT0`J)|y=xhsN<4&!#%mTN5eYs;Y`6l_F>V$}_4RTPRhJt@>Q7H~L)co6_xf
zwPOvx;eTNZs%_&Oa&`vIK4U|aKNqnfHFoJ5<3~sSmAU@M?rn4w=C|}P_v|}QHN%or
z9b$6&*H&()nY&o)Znm9Zqdv`m6;@hHReKTQor&**+hl%EREij%6a2p;K{Q$CR`Q%`
z<`NGnz#KW(7r)u$UMFAYoFK^!AUU{qgqryQC71Sfe#V~9hNBo&!h0fn)9?qMp`{AS
z$q~DN*L~o4!5Hd4mXKL@=GJYM8B82+JR*#NeXiomJd!*fV#Z@}kE*SYPKb?pTlfO`
zHYk;aEu(TCC$FYd!Q3bnpG_(DoCcd|;#?xU>|2(6#j8d&%J+wI6K=wXMvLXtvoFo*
zXxOL2%T1&5JFmgTWXSxxX1z=`hufxOwSYF&nl#ua^G-F?yQH;cOAq*?KRT=qKNxjv
z0~mGQ^K_aLT%j3zr5AfN=~Y?3k=2vRp+Q2YBk2+B{*j;CwTuQwDy98_e5!g3WO2Ps
z+d|`|usVAsPSmo`DX1_5T}a8NN-E0Be4m4>x|$x)GXd?iNG9lND$F=VD-xv6l6W&ZZFc#q1dL#43MO&X!8Xrb4lRY<#V8uyU<2uySn%=mc2t
zr$)6Iagi#T4O%;(_y?e+gHF=7PfgGlP0#lt?I3&j>FC{y*Fi$iz}C!MIf&)yXiPqu
znT#DWQ?kS>vW#XI4Yu46KRU&ex}Oc5>ZbTKS{hk@jZyYmkuYtY05<(MrtU*gU&h^~
zB}=f6g431KG-uOc2Bd#+aoY3e;4xU83fI~@3U^Z*eEl|;T
zB1jEovz@)bFN0PS_KtZ~>^SO=+C@!fvREf$*Ibz!0j;4o`wrreeG=DrkS^&trsiY}
zCA``aJ%9^;A(16@NlWMKSDva;55dPVI!U!ARQva;Qm!mqc#0Mk#V-GGowU4oxivD^
zdqO(L7%+XrJWsVTG(JhV@RX;ttey*~+CXYg<`&6DuHXFftcVR?C1Mv;&*3iXGQyju
zjZ5Q>F21Rqvd^@l6!zcATuj%9&x~f7+WBL8?NpRVQKf+dBQ)99ksf*Qs_mdVgu5xF
zyc@|z>P_x9XZP7wm
z2V|X{Ttipo8RnS6Oosbz>m@bbR}VyyOrvC3!JRx+
zF3aTurDEwb^j#_@tll(lPD6FKzpo+}pTENJwNQvj$x~>dZ^(ngCkKzMNqu*eJBWVr}aB%dK|LE@?3S#!TvF!Hnt=Z0&dU+hj-3d
zJi6k>gn;r@N@kUv;K-we|E;@DXZH!^?y(UVI#edAB>h_*Z-`t)7#)fEwJpVoRv_V%
zQ&Z?uF#Q$ccqFTtaI1Fu1ixP{8<5yQ<9V|SReWU=A$#QzAuFd0cYX(Q*fHe4ZvD^C{Zk|{1;;VBx;WU+qXjSIf8w7C62FN59CjkVs^|W*@4@61D-5P_3wKy4l{i(0
z{>L~m$1R_^>0eTt1X&V6=gnclHFO_i%t6MuTwIQ!QhUBhU|cb-h=nsOMBsT5*ygZz
zxGo($&owzXjX5lZ#JHJX<`}~^k+ESff&TZrXrv)S6p3HGhEt{JS`&`|-wI?o&>WawPfT_o&2gCJb&MTl5&+#7_?RUSz0ERK11y&ceWc~?@T)UThi%jDDL
z^JdN!Q26@lhz{!29eiW&FoITqBlLdG+P{5sxC?ERqF5mN6I^CGZ~SW7uv@dK`FEON
zICxn4bAAs6jp-oM7n4k77QF8yiK4V>ul_~{`fIUfPh|v_Tm3t
zv~oPSZcGf9e!B?Bd-#_gzR)!_ViGAUr>J0=nZ=s!d}#8{cjxdXNGZtdQTUgfD;?<9
zU0kOkojOx)BSv|C+SBz-x%QiFQ~S>j=lI)Yad
zK8yh_`<+c*@6HK>OJ1AxkiB*!D)tbRb>w}Pb=pbknQ>yVPdLtPW5j!~yefZq?Pk5H
zL&xf@`XF3@4!2r_5jFj$W4MTvxGJ%+oh8k`VFAZE?42D`W4FIa@Nbzayvs-L9q9kl`at`pF%5y=ywy}(k!mlKy@uTY8iMAK=do?842Cxd&|DD|E*fg_
z!%I*=;Eg!nFDuBOtr5)41bUA}3oMiDGMnYz=%+M?
z70it94KbajF60dp!YJz=DUvuvWUVfh!V7P$n)hy~OXH_zq%t=w
zzsV_47yGMTjpmlXLay~07RIvObo&o6
zIql#&QH)wAAS}}UUI)&4g#AjDIjqzGz;8c<{d7c<6Gd}NHXT{RVdc*(@nG9!rqTP@
z%dF_Ovwe6AOn^NvS%6j12o%*gb_~J8ZEoZh!_T+_i@69Oxi4#i7_9blwpI+P>JP%=
z#XVHT5Q}6yu|P0p3ButR-RGd|u=vg`Cjw$se?^=LSS0D7>Luvq;TY$-85X31hOqKbmGOv_+b`?fIaoaQSblm
zcJWS)uM!;FPOwzDxFswXg@vBU$cj^xwtXaGegK-KDrY6f16haCa#z?pD0GySv*0#oZ~+;x3E3^xfZ|@Sd~Tb25@ll1Va|
zd%vGctx0AlyKyq=f4&(+X|%SZ*I^k6tB((gqvWJw-qdS5Li?vu64G-c5}j_E5&HnD
z&>ci|X5k&F=&d^L>`;K}Noa)G7`7C4K>7-&VLHYgNv0z@D3`~?JQ#}q7wK;W@+;yS
zo6uO%>go%>e2}4>E9+GLQqtg8c_TwzD5U``_$&nb9RagrSnEe`!r4Xw=WcD%5JfxE
zp`B+K-7gY4(P(DH@dJh>NN}6uL#&X=NU;D%X7{uP3n~Obc6;klbWZ!?R9O3cDoOL=
z4j2siy1Rr&hcq5;cgnx-chJ8x@5FHq{wXK^Kgd#lk>#Rn`)t=m+0+hr{2y@>>vzJrz*U#cqnU0wLxzgz4u)1mY
z1PesOcLF%PY7s?@f30qpGuSr8BH{lyh*vi%E&UC8EJ0}u8rH92k|5`V8c9jvTSF}K
zN6tYmD->=t?x-4C9gLv%=*!IBIchWI@}AwGzIFoC$zd}QhSA^7N(gag^HYf1EL)Qr
zsOzQw23iGQdUH;fZyjZ2nM?BsEQ(>K7>rlAmb80o`9B)YJ7ZJpNlaOB5R4tHRKk#F-)Wbk1q^LsxF78@Uq-
z*Hke1bhJiyVWv$iw^ga_DhtFrukpIKH$jWc_I=qf;PmVZ&7?OnhP4OzSd6s}ya&Ax
ztU0j}Qs%TSMc?^sA`djRtKts{nR~rxSd$?w@tTOB1=y2egsk+h;%SGRebW+X{9M_^
zko^2H{Op!Xs8u`QwQ{E!#6i}
zBN9cRe!DkqFZSu1Iy`DX`Oh?mzE|@c=l9YpExn6&?0tw6y2Xx98PQD;i3`31Y?FYP
zMPvhX7UP^ATT@y*<`<|R1hCo8GVEK7t6nt6`*AtH`Q22v#`L^tJgdjv(lWA4$q8;Q
z>qWjD!Qx?gg>sDXTW~%8K+{qGL$k(+cNbI04vpbHih;Yp9WYk2pPJ9u5o4MN)&vqa>|;|7;x%>L
zhww^32Dr1k)@9k*vRJZp_+??>e|YaphsB7iwe9|PoGcfdu)aU@GekNOSjz+AUKyyA
z1zRt%pACi`CP{Q-+t9P{-aRqgetBCA`c@D($9b4Ia`Na)EOWjSuHSMZ!ZbF7m{gtW
zJMJMp@QERbRilS1E;)scZworIRIO4|y7zI=Bee)>T19wG3J=0*P(_^Znez@eEetRWtnhe|w)6^-$>yjauI(Zmww8)1);*yvF2Kjq7HbfBOBzzI%SF07Eun%o85>A``hIVz|*>G?)GIlX;?Pn+;F1L4nz39-$6g66?Ifx*oth3>??)(}4lo*egM
zVbtSL-$HkGuN?ojmxO4+X%lWPCbujl4X=~-EE(E5oi=AAm8=Pm_woW;BgTR(5B
z2U@Tas(azo*HmdzQoiSp=fDhmd~<$d<#=aGYKNPhx&EWW;0SBz^gmCJL8^}v35B)K
z*(~>&cOEtGMep**w#Z&h=5|Cky5glZ>Y$x1qt0z%mmW1FmY7-wF5l&~zNhS?eBkwj
ztaXlO*P?Llj;!*nO*uK>90PDZgDJkZ<&y0?NCrj+bn$mj_v~JR(J?#tMNYP^6MYAL
zH%Xjbox7KMZZMukgh3?vKb`$1dTwl=MyxkU#CNuyYkc?J!Ev)d{$9vRk?+0|_~Qz2
z6*$rJ&-U>j;^tev$5r4=&p+>{PlC-i{m;JzJTlouRt4)d%v<1>X4p
zj?uw0B%oZw&D;&h50u;9A?)l9*xCjA#Q^V|0LP->8OWx#!C=2~;9UUV7zoN0-ps}9
z6sGV5fZYIK$iFK9>;Vwl1N;32y=1&yCxdAcfC(Z;Vz*&$V{e=CI}aaV8nw;@kxQ}L
z*tapnP5C?z3hx>J1MjEb1e@|kKPkM&{qLEd=Bq*S^{x~>%l`L5PxB-o`Sy+kCl3nH
zkysbV|GsRyx8<#!}SoQx1G!2b_bz%f6enPhE!FXHNdvz=uol
zGN8lo%DugJ5#;j+_#g>5mj*9Kf@*=AwLnlUq-^54{AO(eq{6;9Gwu%QiZs|Go)bZyiD+Ce8y
z8)r@%U?<=b$TJ&w=?T~%1GfP>HavkFKqoBtO;H4{I0|(sp)VY!Ov%O~<^q2y?
zv<19PgC93GFWZ3|S8nawmrj31K>_u^k6Q3!d*{YB*eNg)_#p;(69!#A0XHBG`7;Un
zbOOAEf*;AikGbH-$jwVk;0B;`0|4B3>ezVd+MsZ47e8|f8~}Yn>Lr68A@%az+6Q&>
zT-yWtK%X_h4?)1&9r%%8^OB=$BRIIdd&D6iS5&F^=4$fCq+Q|+jS^-PZ0W_iJR_8`%fPTxAf6XYK0oCh@zgPNB>&C{S}
z5Xe0lcx(ljWdr9Kf<)UpeVrhMcER2;z++Xw?0?`qAV~D7!x!xF)V&0{;{(iYfJCoc
zo;Huc-sQmK0KhCPI1kY2yLAcno&z-xf|?gWcZtAbQ@|`cVAcsROAeSd0?g8Y^W-7*
zT%WpEKzA9yV^;tK%a!-k>6`cSse2oAmjXPt1MIar+w;uQesZkEGf;HD$wnr@vs
z0k=U-qoAfqkmqqE1)#lq801zCgzvZ_2Cy_Nv4Pu;Hyyuww0CT5?}@$Fyj{D4>)60`
z03eY3C*aZraQPD;dI0uW1+`9sS~ozgqoCFm&_fjPTph6DyZIl53qW%E$0fLT1mxcX
z^vwpo(E}h20&i@B03ATcQ)wHLHwyaj1U&hJ!GKO6WIf>8(j@mB#P-zdmjJYE2OgRN
zHblW~z92_uk9NqBK0^9GETsQ;Zcr9Nc~t`~BYj0%zS|J=nXhziIJ>lOpEyBo)9oWC
zNdNvb4hpCSeqcO(Zh#{5Tq%6E{7+<`3ez_u^W7){)t?^4{c(>|{5AJd{l&TnuO^tH*9f>lspW~UzrsnKr0aIgByDT%l
zs@aR@a4Kh)H+vVj$SB5AvBzDFnq4rXO}mvQ@S-oKZYf`o3mA-b^1qOZ5U_ID98G%F
z?8v8BV@5z6VT#YB6X+Pd^1!1hH@`GYV2z;sb4VNUVQ$QG-;2q`srnqL8bm;qiTmvs
z=}O+NQnw7L)^iidpNEHov~%S$1)AEyE8&D#!bTUf&
zP>Aq}Lk*jP{#ITh)!lp(AQ#O(w=k^lB+f9Z$Cm{Er$C;=mDIT8M#*iA3=eD1@DFtn
zvqt=TmW2qbxJ>LHs)4UkWAABS#pgc*ILk_NMujgf@^(;6USdrO3^=JSp8ajaWE2ofMS3wd(hg-g}5kiXx>g9-$R
zN7sC?CFQ*O(h7bgKqMXFG~>DdqG=*!jujp7VVfx8c6o%b$NjB`_u6%=
z7%*iN2=~%UZuqVKe>%6d5KTsb^nHXbwhYe
z_v&S4Sq`WMb&Bm%JGCd6DPw`M+|&rgI2P-tHeZJM{iN@N49zO|kCn-^UPD>4^f?9J
zUTYjeYNedqckt}`Ltcc+YcZQl57=BR(dT;IHVFWn$F5C8Iq8lgiyO5tQ(tfRafk;f
z#h-hTaDq48=e|ZvQ9th)AY9`}Vw>@3!RSslJ->Ij9VM!NMJQOm9&U1ts7DYY%08V8
z|8UulyEbjy*?Z6+YJzCfgI9v|tI)0wF#ocfo6{WC;M!#)&I=-a>k*s^!8E{oc9~bu
zOI;}Vat(ECDYq6>7&Iwad&SHyT5%!ab5)u3
z=zr(9Y)me-YQ>tFsq3XQD-uKwNTPGtJ|DkHcfXYOi&}iXkjw@G0Uk2bb!jMFA$;vd3Ips0$jFU*!I7b)Qp?5x&j#2&{
zn*KW+5O4MKo)gc-y(s~vN4x{mc>*21k@7<@c>-Nn(O=5bQUAqTjQzSCw7L~m6r1qi-L86@
zWGNtLY&%!(wA$$-b`f6Hpd4I_I
z%yNUnF?T%_ukI;9m>`7ZZ(JL_(a|jDI@YioS${jZHv`wEL~A&)PXU};{}KvdK*Wv`
zb%_g0Hb-P?*vGEvzC3u1@nVO0C+eU{&Gmr#TSdctmH{96U;Nn){xS0v=1Z4z06r9w
zwjV{}uTzfHRcNR=>cT`@=cO?WAqxh^aV@nE3qdS;NF&9bVG15CK{9
zF{U&xyT1NRLiCvoMnDp+7Ap@de(Auq>eYb
zVnQ2w7+dCipBB6|gKb0n)u@Z7v}Nl1yCG;;wS*a=Y6k&zlT6FQPL=H{$md`udMk+s
zO_?_&GND0rYy7D8)?gDiDhs~>iagWA$682294>8=x4Tb5eLNuz@dYQ{X3rbCY_Lu6
zXpMUrRYJ~iOv<5H2rSjc-^^C?9E9ZRY#Z>iU?}kAQvvp64pq;TPM1v*xxtW})Cteb
z+X^#nnc0c0s%fBRjlRXXve&&jvpzLg>skj%AX9m^OqpvjpXkC-d``D#P3my)gHrUU
z$p{PIZ=NFxwbHZc;gCQD=>bLb*IG}^I(MhOBadkSJZbaB$cRPG{(elE0J%lmpArV7
z%mwyK7e;iGM?~Q&Dz$!*uav0`|LrM$?Eoy|WPjk@-4c_}_m!^xh58&|$(bfFnh#(l
z`bOwYR@ITlqBuBH+FK#p8D!7<%;&mnQ{{CHw{59agF){SN#{BELhAeQU+niYYd+p1
zs?G1hO>mh|d57sgsi8I1;8PYkTMudRcS%TWb~UgSGY)IfzG!o^eb?4&``)rug-?Ex
z0#(HDn<(Ne%rsw5BxKPzN2S0C^LpS0)hZOau^r+SY`))@6iNH?^=2!XDWR4$a+KMx
zW_0xIhG*tv?JrOM?$OiZcyn$*DIbbxCW3g0s{Aw4(6?nu2UjvCr46XQPEh7gl;6AzhvAHKI9PV_&?
z-kYD-1o*g^Uz?h|hSkaWXD2eQSs=!kt*3#R>=#AMJGj?@s
zmKA+7nfus2z8O>F$!gpl8I(+t7~EErPxL$(B3-k;lHoybO(WxbCj7LG(`nqew@A1s
zb?JOA8P-C&DFr{fz2s=IzvVBLGG3WHdi_GE?3d_1848$()BTEDC>XosH86l4He*?E
zp#M?qmN&3_TsB6FSll<;@Qps7K)qUFbGDwzC?-5