From 71e149c513b9139dd0f51377b9098dac0b801cd2 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Mon, 24 Jun 2019 10:22:41 +0200 Subject: [PATCH 01/67] v0.8.1 --- Cargo.lock | 2 +- Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fbc61cb..354e760 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3168,7 +3168,7 @@ dependencies = [ [[package]] name = "zola" -version = "0.8.0" +version = "0.8.1" dependencies = [ "actix-files 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 40c35e9..9cb0454 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "zola" -version = "0.8.0" -authors = ["Vincent Prouillet "] +version = "0.8.1" +authors = ["Vincent Prouillet "] license = "MIT" readme = "README.md" description = "A fast static site generator with everything built-in" From d43812dee65d1f668f4c1457b3b8443484532cde Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 23 Jun 2019 10:47:36 +0200 Subject: [PATCH 02/67] chore: Update toml to 0.5 everywhere Signed-off-by: Igor Gnatenko --- Cargo.lock | 15 +++------------ Cargo.toml | 4 ++-- components/library/Cargo.toml | 2 +- components/utils/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 354e760..aa228c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1257,7 +1257,7 @@ dependencies = [ "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.10 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -2772,14 +2772,6 @@ dependencies = [ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "toml" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "toml" version = "0.5.1" @@ -2978,7 +2970,7 @@ dependencies = [ "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.10 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3183,7 +3175,7 @@ dependencies = [ "rebuild 0.1.0", "site 0.1.0", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", "ws 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3464,7 +3456,6 @@ dependencies = [ "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" "checksum tokio-trace-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9c8a256d6956f7cb5e2bdfe8b1e8022f1a09206c6c2b1ba00f3b746b260c613" "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" -"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" "checksum toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b8c96d7873fa7ef8bdeb3a9cda3ac48389b4154f32b9803b4bc26220b677b039" "checksum trust-dns-proto 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5559ebdf6c2368ddd11e20b11d6bbaf9e46deb803acd7815e93f5a7b4a6d2901" "checksum trust-dns-resolver 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9992e58dba365798803c0b91018ff6c8d3fc77e06977c4539af2a6bfe0a039" diff --git a/Cargo.toml b/Cargo.toml index 9cb0454..ad1228d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ atty = "0.2.11" clap = "2" chrono = "0.4" lazy_static = "1.1.0" -toml = "0.4" +toml = "0.5" termcolor = "1.0.4" # Used in init to ensure the url given as base_url is a valid one url = "1.5" @@ -56,4 +56,4 @@ members = [ [profile.release] lto = true -codegen-units = 1 \ No newline at end of file +codegen-units = 1 diff --git a/components/library/Cargo.toml b/components/library/Cargo.toml index 94af375..41cc036 100644 --- a/components/library/Cargo.toml +++ b/components/library/Cargo.toml @@ -22,5 +22,5 @@ errors = { path = "../errors" } [dev-dependencies] tempfile = "3" -toml = "0.4" +toml = "0.5" globset = "0.4" diff --git a/components/utils/Cargo.toml b/components/utils/Cargo.toml index 75f2eeb..8242533 100644 --- a/components/utils/Cargo.toml +++ b/components/utils/Cargo.toml @@ -8,7 +8,7 @@ errors = { path = "../errors" } tera = "1.0.0-beta.10" unicode-segmentation = "1.2" walkdir = "2" -toml = "0.4" +toml = "0.5" serde = "1" [dev-dependencies] From 79dfe92bbfb74820b499988b117081f1a5b45d42 Mon Sep 17 00:00:00 2001 From: Jakub Turski Date: Wed, 26 Jun 2019 15:50:29 +0100 Subject: [PATCH 03/67] Update cli-usage.md (#729) * Update cli-usage.md * clarify that it's only the links from markdown files that are being checked; --- docs/content/documentation/getting-started/cli-usage.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/content/documentation/getting-started/cli-usage.md b/docs/content/documentation/getting-started/cli-usage.md index 1167981..505429e 100644 --- a/docs/content/documentation/getting-started/cli-usage.md +++ b/docs/content/documentation/getting-started/cli-usage.md @@ -86,7 +86,8 @@ $ zola --config config.staging.toml serve ### check The check subcommand will try to build all pages just like the build command would, but without writing any of the -results to disk. Additionally, it always checks external links regardless of the site configuration. +results to disk. Additionally, it will also check all external links present in Markdown files by trying to fetch +them (links present in the template files will not be checked). ## Colored output From 059ca55b366ee4c576113199d48f8603908278b7 Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Sun, 30 Jun 2019 11:03:10 -0400 Subject: [PATCH 04/67] Update LiveReload.js to v3.0.0 (#730) --- src/cmd/livereload.js | 2 +- src/cmd/serve.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/cmd/livereload.js b/src/cmd/livereload.js index 6dd6d19..ae58083 100644 --- a/src/cmd/livereload.js +++ b/src/cmd/livereload.js @@ -1 +1 @@ -!function e(t,n,o){function i(s,l){if(!n[s]){if(!t[s]){var c="function"==typeof require&&require;if(!l&&c)return c(s,!0);if(r)return r(s,!0);var a=Error("Cannot find module '"+s+"'");throw a.code="MODULE_NOT_FOUND",a}var h=n[s]={exports:{}};t[s][0].call(h.exports,function(e){var n=t[s][1][e];return i(n?n:e)},h,h.exports,e,t,n,o)}return n[s].exports}for(var r="function"==typeof require&&require,s=0;st;t++)e=o[t],(e.href&&e.rel.match(/^stylesheet\/less$/i)||e.rel.match(/stylesheet/i)&&e.type.match(/^text\/(x-)?less$/i))&&i.push(e);return i}(),0===t.length)return!1;for(n=0,o=t.length;o>n;n++)e=t[n],e.href=this.host.generateCacheBustUrl(e.href);return this.host.console.log("LiveReload is asking LESS to recompile all stylesheets"),this.window.less.refresh(!0),!0},e.prototype.analyze=function(){return{disable:!(!this.window.less||!this.window.less.refresh)}},e}()}).call(this)},{}],4:[function(e,t,n){(function(){var t,o,i,r,s;t=e("./connector").Connector,s=e("./timer").Timer,i=e("./options").Options,r=e("./reloader").Reloader,n.LiveReload=o=function(){function e(e){return this.window=e,this.listeners={},this.plugins=[],this.pluginIdentifiers={},this.console=this.window.location.href.match(/LR-verbose/)&&this.window.console&&this.window.console.log&&this.window.console.error?this.window.console:{log:function(){},error:function(){}},(this.WebSocket=this.window.WebSocket||this.window.MozWebSocket)?(this.options=i.extract(this.window.document))?(this.reloader=new r(this.window,this.console,s),void(this.connector=new t(this.options,this.WebSocket,s,{connecting:function(){return function(){}}(this),socketConnected:function(){return function(){}}(this),connected:function(e){return function(t){var n;return"function"==typeof(n=e.listeners).connect&&n.connect(),e.log("LiveReload is connected to "+e.options.host+":"+e.options.port+" (protocol v"+t+")."),e.analyze()}}(this),error:function(){return function(e){console.log(e)}}(this),disconnected:function(e){return function(t,n){var o;switch("function"==typeof(o=e.listeners).disconnect&&o.disconnect(),t){case"cannot-connect":return e.log("LiveReload cannot connect to "+e.options.host+":"+e.options.port+", will retry in "+n+" sec.");case"broken":return e.log("LiveReload disconnected from "+e.options.host+":"+e.options.port+", reconnecting in "+n+" sec.");case"handshake-timeout":return e.log("LiveReload cannot connect to "+e.options.host+":"+e.options.port+" (handshake timeout), will retry in "+n+" sec.");case"handshake-failed":return e.log("LiveReload cannot connect to "+e.options.host+":"+e.options.port+" (handshake failed), will retry in "+n+" sec.");case"manual":break;case"error":break;default:return e.log("LiveReload disconnected from "+e.options.host+":"+e.options.port+" ("+t+"), reconnecting in "+n+" sec.")}}}(this),message:function(e){return function(t){switch(t.command){case"reload":return e.performReload(t);case"alert":return e.performAlert(t)}}}(this)}))):void this.console.error("LiveReload disabled because it could not find its own From 99abbb87a195e98c7a3fafbdc268dc0d5a7ad0fd Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Fri, 19 Jul 2019 10:35:31 +0200 Subject: [PATCH 27/67] Set up CI with Azure Pipelines (#750) * Set up CI with Azure Pipelines [skip ci] * Remove other CI + remove newline in anchor link tpl * Some more Windows specific changes --- .travis.yml | 60 -------- appveyor.yml | 57 -------- azure-pipelines.yml | 133 ++++++++++++++++++ ci/before_deploy.ps1 | 22 --- ci/before_deploy.sh | 31 ---- ci/install.sh | 31 ---- ci/script.sh | 17 --- components/rendering/tests/markdown.rs | 14 +- .../templates/src/builtins/anchor-link.html | 2 +- .../templates/src/global_fns/load_data.rs | 18 ++- 10 files changed, 156 insertions(+), 229 deletions(-) delete mode 100644 .travis.yml delete mode 100644 appveyor.yml create mode 100644 azure-pipelines.yml delete mode 100644 ci/before_deploy.ps1 delete mode 100644 ci/before_deploy.sh delete mode 100644 ci/install.sh delete mode 100644 ci/script.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0f9298f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,60 +0,0 @@ -dist: trusty -language: rust -services: docker - -env: - global: - - CRATE_NAME=zola - -matrix: - include: - # Linux - - env: TARGET=x86_64-unknown-linux-gnu - # OSX - - env: TARGET=x86_64-apple-darwin - os: osx - - # The earliest stable Rust version that works - - env: TARGET=x86_64-unknown-linux-gnu - rust: 1.34.0 - - -before_install: set -e - -install: - - sh ci/install.sh - - source ~/.cargo/env || true - -script: - - bash ci/script.sh - -after_script: set +e - -before_deploy: - - sh ci/before_deploy.sh - -deploy: - api_key: - secure: "nksXOY7p8vAWDpItN9Tyx+0CmOPMj/iAgH+iT512URpgJG/i+ziUWDEYpQO4PfZMJUDUa1tnSZ31O4MIe2Sgfj6DHR1zK+LKeLaZxuxxJUSMXSAkbIXcjFlOPKQBPnMZVVcDaHMxz18jiRpElDR2k0PIEtspW2rDsrr+7mzmQn7pan60k77tU3RG3K7fYgMmNjVv64XqMBSCS3fpqiroIz7rVL1HZ3sCoTNnxDM8nXo/8gTjlVowTvUTsVyHRgtDRJdlPuI0yf4oJmvQPX74P2OkQmOVpGxeJ/gSTJ1xWxYfMgyvNaiO9NKF+fUfxvHR/V58CfBHPdJkcnThV5KIPjE5mHZfSTFf5cG6gJtnVhvhQV7vBhIRI/iCt55SPCXse1HWzTY1GxE5oXw2VzUt/kzD2pFf8rtf64JURgGolenYv3aw+ps1MGUwUjl8CF31XBSiASVwpif7kd9P3bafg6pGUytfjgpV/wJJc8OpO8IGwTSNe4r0wtcFb92stxta4NKC3L4F0w/juaK+0+Mjt4SCyh6rRzpHQu9TJKniskp7/URp5KhMFAo66sFpgSYVa23OTkYmjtB8IqlJzmpuDSs/WSAVA8InSgHDaQeBd0UEbNaWU1+avtAGBtb8+rZnbw7ikPF0j2pHImD5ZjHp7+jt/hpcwqrOkBuB5CSeBKs=" - file_glob: true - file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.* - on: - condition: $TRAVIS_RUST_VERSION = stable - tags: true - provider: releases - skip_cleanup: true - -cache: cargo -before_cache: - # Travis can't cache files that are not readable by "others" - - chmod -R a+r $HOME/.cargo - -branches: - only: - # release tags - - /^v\d+\.\d+\.\d+.*$/ - - master - - next - -notifications: - email: false diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index bfa5bb6..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Based on the "trust" template v0.1.1 -# https://github.com/japaric/trust/tree/v0.1.1 - -os: Visual Studio 2017 - -environment: - global: - RUST_VERSION: stable - CRATE_NAME: zola - - matrix: - - target: x86_64-pc-windows-msvc - RUST_VERSION: 1.34.0 - - target: x86_64-pc-windows-msvc - RUST_VERSION: stable - -install: - - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - - curl -sSf -o rustup-init.exe https://win.rustup.rs/ - - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_VERSION% - - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - rustc -Vv - - cargo -V - -test_script: - # we don't run the "test phase" when doing deploys - - if [%APPVEYOR_REPO_TAG%]==[false] ( - cargo test --all --target %TARGET% - ) - -before_deploy: - - cargo rustc --target %TARGET% --release --bin zola -- -C lto - - ps: ci\before_deploy.ps1 - -deploy: - artifact: /.*\.zip/ - auth_token: - secure: i64eFOHoySQryE3M9pr2JGRukAK3LGltOsUxeFHwilS+3O6/6828A4NUmI0FW4zN - description: '' - on: - RUST_VERSION: stable - appveyor_repo_tag: true - provider: GitHub - -cache: - - C:\Users\appveyor\.cargo\registry - - target - -branches: - only: - # Release tags - - /^v\d+\.\d+\.\d+.*$/ - - master - - next - -# disable automatic builds -build: false diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..fcbe8cb --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,133 @@ +trigger: + branches: + include: ['*'] + tags: + include: ['*'] + +stages: + - stage: Tests + jobs: + - job: + strategy: + matrix: + windows-stable: + imageName: 'vs2017-win2016' + rustup_toolchain: stable + mac-stable: + imageName: 'macos-10.14' + rustup_toolchain: stable + linux-stable: + imageName: 'ubuntu-16.04' + rustup_toolchain: stable + linux-1.34: + imageName: 'ubuntu-16.04' + rustup_toolchain: 1.34.0 + pool: + vmImage: $(imageName) + steps: + - script: | + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN + echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + displayName: Install rust + condition: ne( variables['Agent.OS'], 'Windows_NT' ) + - script: | + curl -sSf -o rustup-init.exe https://win.rustup.rs + rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN% + echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin" + displayName: Windows install rust + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + - script: cargo build --all + displayName: Cargo build + - script: cargo test --all + displayName: Cargo test + + + - stage: Release + dependsOn: Tests + condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') + jobs: + - job: + strategy: + matrix: + windows-stable: + imageName: 'vs2017-win2016' + rustup_toolchain: stable + target: 'x86_64-pc-windows-msvc' + mac-stable: + imageName: 'macos-10.14' + rustup_toolchain: stable + target: 'x86_64-apple-darwin' + linux-stable: + imageName: 'ubuntu-16.04' + rustup_toolchain: stable + target: 'x86_64-unknown-linux-gnu' + pool: + vmImage: $(imageName) + steps: + - script: | + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN + echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + displayName: Install rust + condition: ne( variables['Agent.OS'], 'Windows_NT' ) + - script: | + curl -sSf -o rustup-init.exe https://win.rustup.rs + rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN% + echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin" + displayName: Windows install rust + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + + - script: | + rustup target add $TARGET + cargo build --release --target $TARGET + condition: ne( variables['Agent.OS'], 'Windows_NT' ) + displayName: Build + - script: | + rustup target add %TARGET% + cargo build --release --target %TARGET% + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + displayName: Build on Windows + + - task: CopyFiles@2 + displayName: Copy assets + condition: ne( variables['Agent.OS'], 'Windows_NT' ) + inputs: + sourceFolder: '$(Build.SourcesDirectory)/target/$(TARGET)/release' + contents: zola + targetFolder: '$(Build.BinariesDirectory)/' + - task: CopyFiles@2 + displayName: Copy assets on Windows + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + inputs: + sourceFolder: '$(Build.SourcesDirectory)/target/$(TARGET)/release' + contents: zola.exe + targetFolder: '$(Build.BinariesDirectory)/' + + - task: ArchiveFiles@2 + displayName: Gather assets + condition: ne( variables['Agent.OS'], 'Windows_NT' ) + inputs: + rootFolderOrFile: '$(Build.BinariesDirectory)/zola' + archiveType: 'tar' + tarCompression: 'gz' + archiveFile: '$(Build.ArtifactStagingDirectory)/zola-$(Build.SourceBranchName)-$(TARGET).tar.gz' + - task: ArchiveFiles@2 + displayName: Gather assets + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + inputs: + rootFolderOrFile: '$(Build.BinariesDirectory)/zola.exe' + archiveType: 'tar' + tarCompression: 'gz' + archiveFile: '$(Build.ArtifactStagingDirectory)/zola-$(Build.SourceBranchName)-$(TARGET).tar.gz' + + - task: GithubRelease@0 + inputs: + gitHubConnection: 'zola' + repositoryName: 'keats/azure-pipelines-test' + action: 'edit' + target: '$(build.sourceVersion)' + tagSource: 'manual' + tag: '$(Build.SourceBranchName)' + assets: '$(Build.ArtifactStagingDirectory)/zola-$(Build.SourceBranchName)-$(TARGET).tar.gz' + title: '$(Build.SourceBranchName)' + assetUploadMode: 'replace' + addChangeLog: true diff --git a/ci/before_deploy.ps1 b/ci/before_deploy.ps1 deleted file mode 100644 index 08bd1d2..0000000 --- a/ci/before_deploy.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -# This script takes care of packaging the build artifacts that will go in the -# release zipfile - -$SRC_DIR = $PWD.Path -$STAGE = [System.Guid]::NewGuid().ToString() - -Set-Location $ENV:Temp -New-Item -Type Directory -Name $STAGE -Set-Location $STAGE - -$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip" - -Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\zola.exe" '.\' - -7z a "$ZIP" * - -Push-AppveyorArtifact "$ZIP" - -Remove-Item *.* -Force -Set-Location .. -Remove-Item $STAGE -Set-Location $SRC_DIR diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh deleted file mode 100644 index e2f9fe0..0000000 --- a/ci/before_deploy.sh +++ /dev/null @@ -1,31 +0,0 @@ -# This script takes care of building your crate and packaging it for release - -set -ex - -main() { - local src=$(pwd) \ - stage= - - case $TRAVIS_OS_NAME in - linux) - stage=$(mktemp -d) - ;; - osx) - stage=$(mktemp -d -t tmp) - ;; - esac - - test -f Cargo.lock || cargo generate-lockfile - - cross rustc --bin zola --target $TARGET --release -- -C lto - - cp target/$TARGET/release/zola $stage/ - - cd $stage - tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz * - cd $src - - rm -rf $stage -} - -main diff --git a/ci/install.sh b/ci/install.sh deleted file mode 100644 index 76bb734..0000000 --- a/ci/install.sh +++ /dev/null @@ -1,31 +0,0 @@ -set -ex - -main() { - curl https://sh.rustup.rs -sSf | \ - sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION - - local target= - if [ $TRAVIS_OS_NAME = linux ]; then - target=x86_64-unknown-linux-gnu - sort=sort - else - target=x86_64-apple-darwin - sort=gsort # for `sort --sort-version`, from brew's coreutils. - fi - - # This fetches latest stable release - local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ - | cut -d/ -f3 \ - | grep -E '^v[0-9.]+$' \ - | $sort --version-sort \ - | tail -n1) - echo cross version: $tag - curl -LSfs https://japaric.github.io/trust/install.sh | \ - sh -s -- \ - --force \ - --git japaric/cross \ - --tag $tag \ - --target $target -} - -main diff --git a/ci/script.sh b/ci/script.sh deleted file mode 100644 index aaf17fe..0000000 --- a/ci/script.sh +++ /dev/null @@ -1,17 +0,0 @@ -# This script takes care of testing your crate - -set -ex - -# TODO This is the "test phase", tweak it as you see fit -main() { - if [ ! -z $DISABLE_TESTS ]; then - return - fi - - cross test --all --target $TARGET -} - -# we don't run the "test phase" when doing deploys -if [ -z $TRAVIS_TAG ]; then - main -fi diff --git a/components/rendering/tests/markdown.rs b/components/rendering/tests/markdown.rs index 42c4768..37ec910 100644 --- a/components/rendering/tests/markdown.rs +++ b/components/rendering/tests/markdown.rs @@ -409,7 +409,7 @@ fn can_insert_anchor_left() { let res = render_content("# Hello", &context).unwrap(); assert_eq!( res.body, - "

🔗\nHello

\n" + "

🔗Hello

\n" ); } @@ -421,7 +421,7 @@ fn can_insert_anchor_right() { let res = render_content("# Hello", &context).unwrap(); assert_eq!( res.body, - "

Hello🔗\n

\n" + "

Hello🔗

\n" ); } @@ -433,8 +433,8 @@ fn can_insert_anchor_for_multi_header() { let res = render_content("# Hello\n# World", &context).unwrap(); assert_eq!( res.body, - "

Hello🔗\n

\n\ -

World🔗\n

\n" + "

Hello🔗

\n\ +

World🔗

\n" ); } @@ -447,7 +447,7 @@ fn can_insert_anchor_with_exclamation_mark() { let res = render_content("# Hello!", &context).unwrap(); assert_eq!( res.body, - "

🔗\nHello!

\n" + "

🔗Hello!

\n" ); } @@ -460,7 +460,7 @@ fn can_insert_anchor_with_link() { let res = render_content("## [Rust](https://rust-lang.org)", &context).unwrap(); assert_eq!( res.body, - "

🔗\nRust

\n" + "

🔗Rust

\n" ); } @@ -472,7 +472,7 @@ fn can_insert_anchor_with_other_special_chars() { let res = render_content("# Hello*_()", &context).unwrap(); assert_eq!( res.body, - "

🔗\nHello*_()

\n" + "

🔗Hello*_()

\n" ); } diff --git a/components/templates/src/builtins/anchor-link.html b/components/templates/src/builtins/anchor-link.html index cea5e50..4f6256d 100644 --- a/components/templates/src/builtins/anchor-link.html +++ b/components/templates/src/builtins/anchor-link.html @@ -1 +1 @@ -🔗 +🔗 \ No newline at end of file diff --git a/components/templates/src/global_fns/load_data.rs b/components/templates/src/global_fns/load_data.rs index f932eca..c45c949 100644 --- a/components/templates/src/global_fns/load_data.rs +++ b/components/templates/src/global_fns/load_data.rs @@ -445,7 +445,11 @@ mod tests { args.insert("path".to_string(), to_value("test.css").unwrap()); let result = static_fn.call(&args.clone()).unwrap(); - assert_eq!(result, ".hello {}\n",); + if cfg!(windows) { + assert_eq!(result, ".hello {}\r\n",); + } else { + assert_eq!(result, ".hello {}\n",); + }; } #[test] @@ -456,7 +460,11 @@ mod tests { args.insert("format".to_string(), to_value("plain").unwrap()); let result = static_fn.call(&args.clone()).unwrap(); - assert_eq!(result, "Number,Title\n1,Gutenberg\n2,Printing",); + if cfg!(windows) { + assert_eq!(result, "Number,Title\r\n1,Gutenberg\r\n2,Printing",); + } else { + assert_eq!(result, "Number,Title\n1,Gutenberg\n2,Printing",); + }; } #[test] @@ -467,7 +475,11 @@ mod tests { args.insert("format".to_string(), to_value("plain").unwrap()); let result = static_fn.call(&args.clone()).unwrap(); - assert_eq!(result, ".hello {}\n",); + if cfg!(windows) { + assert_eq!(result, ".hello {}\r\n",); + } else { + assert_eq!(result, ".hello {}\n",); + }; } #[test] From 0e4e0c35b375addccec086a7224142c80fe5302d Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Fri, 19 Jul 2019 11:10:28 +0200 Subject: [PATCH 28/67] Remove all draft specific code --- CHANGELOG.md | 8 ++- Cargo.lock | 2 +- Cargo.toml | 2 +- components/library/src/library.rs | 13 +---- components/library/src/sorting.rs | 51 ++++--------------- components/rendering/tests/markdown.rs | 1 - components/search/src/lib.rs | 2 +- components/site/src/lib.rs | 23 +++++---- components/site/src/sitemap.rs | 1 - components/site/tests/site.rs | 2 +- docs/content/documentation/content/page.md | 2 +- .../documentation/content/taxonomies.md | 3 +- docs/content/documentation/templates/rss.md | 2 +- src/cmd/serve.rs | 38 ++++++-------- src/main.rs | 2 +- 15 files changed, 53 insertions(+), 99 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b453ed..6d90361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,16 @@ # Changelog -## 0.8.1 (unreleased) +## 0.9.0 (unreleased) +### Breaking + +- Pages with draft=true are now only loaded/rendered in `zola serve` + +### Other - Add `--open` flag to open server URL in default browser - Fix sitemaps namespace - Update livereload - Add `hard_link_static` config option to hard link things in the static directory instead of copying -- Pages with draft=true are not longer rendered in `zola build` - Add warning for old style internal links since they would still function silently - Add some counts to `zola check` diff --git a/Cargo.lock b/Cargo.lock index 4e0ef68..1a49892 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3202,7 +3202,7 @@ dependencies = [ [[package]] name = "zola" -version = "0.8.1" +version = "0.9.0" dependencies = [ "actix-files 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 1b1f9ba..871ae75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zola" -version = "0.8.1" +version = "0.9.0" authors = ["Vincent Prouillet "] license = "MIT" readme = "README.md" diff --git a/components/library/src/library.rs b/components/library/src/library.rs index 9cd7555..e29f1b8 100644 --- a/components/library/src/library.rs +++ b/components/library/src/library.rs @@ -236,18 +236,7 @@ impl Library { for (key, (sorted, cannot_be_sorted, sort_by)) in updates { // Find sibling between sorted pages first - let with_siblings = find_siblings( - sorted - .iter() - .map(|k| { - if let Some(page) = self.pages.get(*k) { - (k, page.is_draft()) - } else { - unreachable!("Sorting got an unknown page") - } - }) - .collect(), - ); + let with_siblings = find_siblings(&sorted); for (k2, val1, val2) in with_siblings { if let Some(page) = self.pages.get_mut(k2) { diff --git a/components/library/src/sorting.rs b/components/library/src/sorting.rs index bd8b98a..2df1ade 100644 --- a/components/library/src/sorting.rs +++ b/components/library/src/sorting.rs @@ -57,53 +57,21 @@ pub fn sort_pages_by_weight(pages: Vec<(&Key, Option, &str)>) -> (Vec) -> Vec<(Key, Option, Option)> { +pub fn find_siblings(sorted: &[Key]) -> Vec<(Key, Option, Option)> { let mut res = Vec::with_capacity(sorted.len()); let length = sorted.len(); - for (i, (key, is_draft)) in sorted.iter().enumerate() { - if *is_draft { - res.push((**key, None, None)); - continue; - } - let mut with_siblings = (**key, None, None); + for (i, key) in sorted.iter().enumerate() { + let mut with_siblings = (*key, None, None); if i > 0 { - let mut j = i; - loop { - if j == 0 { - break; - } - - j -= 1; - - if sorted[j].1 { - continue; - } - // lighter / later - with_siblings.1 = Some(*sorted[j].0); - break; - } + // lighter / later + with_siblings.1 = Some(sorted[i - 1]); } if i < length - 1 { - let mut j = i; - loop { - if j == length - 1 { - break; - } - - j += 1; - - if sorted[j].1 { - continue; - } - - // heavier/earlier - with_siblings.2 = Some(*sorted[j].0); - break; - } + // heavier/earlier + with_siblings.2 = Some(sorted[i + 1]); } res.push(with_siblings); } @@ -208,10 +176,9 @@ mod tests { let page3 = create_page_with_weight(3); let key3 = dense.insert(page3.clone()); - let input = - vec![(&key1, page1.is_draft()), (&key2, page2.is_draft()), (&key3, page3.is_draft())]; + let input = vec![key1, key2, key3]; - let pages = find_siblings(input); + let pages = find_siblings(&input); assert_eq!(pages[0].1, None); assert_eq!(pages[0].2, Some(key2)); diff --git a/components/rendering/tests/markdown.rs b/components/rendering/tests/markdown.rs index 37ec910..9c1e2d5 100644 --- a/components/rendering/tests/markdown.rs +++ b/components/rendering/tests/markdown.rs @@ -820,7 +820,6 @@ fn doesnt_try_to_highlight_content_from_shortcode() { // assert_eq!(res.body, expected); //} - // https://github.com/getzola/zola/issues/747 #[test] fn leaves_custom_url_scheme_untouched() { diff --git a/components/search/src/lib.rs b/components/search/src/lib.rs index be935ec..846e42e 100644 --- a/components/search/src/lib.rs +++ b/components/search/src/lib.rs @@ -72,7 +72,7 @@ fn add_section_to_index(index: &mut Index, section: &Section, library: &Library) for key in §ion.pages { let page = library.get_page_by_key(*key); - if !page.meta.in_search_index || page.meta.draft { + if !page.meta.in_search_index { continue; } diff --git a/components/site/src/lib.rs b/components/site/src/lib.rs index 65011a3..3a0829a 100644 --- a/components/site/src/lib.rs +++ b/components/site/src/lib.rs @@ -230,7 +230,7 @@ impl Site { for page in pages { let p = page?; // Draft pages are not rendered in zola build so we just discard them - if p.meta.draft && self.config.is_in_build_mode() { + if p.meta.draft && !self.config.is_in_serve_mode() { continue; } pages_insert_anchors.insert( @@ -323,7 +323,11 @@ impl Site { .collect(); if self.config.is_in_check_mode() { - println!("> Checked {} internal link(s) with an anchor: {} error(s) found.", all_links.len(), errors.len()); + println!( + "> Checked {} internal link(s) with an anchor: {} error(s) found.", + all_links.len(), + errors.len() + ); } if errors.is_empty() { @@ -392,7 +396,11 @@ impl Site { .collect() }); - println!("> Checked {} external link(s): {} error(s) found.", all_links.len(), errors.len()); + println!( + "> Checked {} external link(s): {} error(s) found.", + all_links.len(), + errors.len() + ); if errors.is_empty() { return Ok(()); @@ -624,7 +632,7 @@ impl Site { copy_directory( &self.base_path.join("themes").join(theme).join("static"), &self.output_path, - false + false, )?; } // We're fine with missing static folders @@ -901,7 +909,7 @@ impl Site { ) } - /// Renders all taxonomies with at least one non-draft post + /// Renders all taxonomies pub fn render_taxonomies(&self) -> Result<()> { for taxonomy in &self.taxonomies { self.render_taxonomy(taxonomy)?; @@ -1018,10 +1026,7 @@ impl Site { ensure_directory_exists(&self.output_path)?; let mut context = Context::new(); - let mut pages = all_pages - .into_iter() - .filter(|p| p.meta.date.is_some() && !p.is_draft()) - .collect::>(); + let mut pages = all_pages.into_iter().filter(|p| p.meta.date.is_some()).collect::>(); // Don't generate a RSS feed if none of the pages has a date if pages.is_empty() { diff --git a/components/site/src/sitemap.rs b/components/site/src/sitemap.rs index 505c30a..72152f7 100644 --- a/components/site/src/sitemap.rs +++ b/components/site/src/sitemap.rs @@ -62,7 +62,6 @@ pub fn find_entries<'a>( let pages = library .pages_values() .iter() - .filter(|p| !p.is_draft()) .map(|p| { let date = match p.meta.date { Some(ref d) => Some(d.to_string()), diff --git a/components/site/tests/site.rs b/components/site/tests/site.rs index 7435146..bb5f8d4 100644 --- a/components/site/tests/site.rs +++ b/components/site/tests/site.rs @@ -42,7 +42,7 @@ fn can_parse_site() { let posts_section = library.get_section(&posts_path.join("_index.md")).unwrap(); assert_eq!(posts_section.subsections.len(), 2); - assert_eq!(posts_section.pages.len(), 9); // 10 with 1 draft == 9 + assert_eq!(posts_section.pages.len(), 9); // 10 with 1 draft == 9 assert_eq!( posts_section.ancestors, vec![*library.get_section_key(&index_section.file.path).unwrap()] diff --git a/docs/content/documentation/content/page.md b/docs/content/documentation/content/page.md index c1ab276..87a4a19 100644 --- a/docs/content/documentation/content/page.md +++ b/docs/content/documentation/content/page.md @@ -55,7 +55,7 @@ date = # will not be rendered. weight = 0 -# A draft page will not be present in prev/next pagination +# A draft page is only rendered in `zola serve`, they are ignored in `zola build` and `zola check` draft = false # If filled, it will use that slug instead of the filename to make up the URL diff --git a/docs/content/documentation/content/taxonomies.md b/docs/content/documentation/content/taxonomies.md index 8b79cf0..606abcf 100644 --- a/docs/content/documentation/content/taxonomies.md +++ b/docs/content/documentation/content/taxonomies.md @@ -28,8 +28,7 @@ categories = ["programming"] +++ ``` -The taxonomy pages will only be created if at least one non-draft page is found and -are available at the following paths: +The taxonomy pages are available at the following paths: ```plain $BASE_URL/$NAME/ diff --git a/docs/content/documentation/templates/rss.md b/docs/content/documentation/templates/rss.md index 6212f79..8d1513c 100644 --- a/docs/content/documentation/templates/rss.md +++ b/docs/content/documentation/templates/rss.md @@ -8,7 +8,7 @@ generate an `rss.xml` page for the site, which will live at `base_url/rss.xml`. generate the `rss.xml` page, Zola will look for a `rss.xml` file in the `templates` directory or, if one does not exist, will use the use the built-in rss template. -**Only pages with a date and that are not draft will be available.** +**Only pages with a date will be available.** The RSS template gets two variables in addition of the config: diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs index f49eca9..9768547 100644 --- a/src/cmd/serve.rs +++ b/src/cmd/serve.rs @@ -62,7 +62,7 @@ struct ErrorFilePaths { } fn not_found( - res: dev::ServiceResponse + res: dev::ServiceResponse, ) -> std::result::Result, actix_web::Error> { let buf: Vec = { let error_files: &ErrorFilePaths = res.request().app_data().unwrap(); @@ -74,15 +74,10 @@ fn not_found( }; let new_resp = HttpResponse::build(http::StatusCode::NOT_FOUND) - .header( - http::header::CONTENT_TYPE, - http::header::HeaderValue::from_static("text/html"), - ) + .header(http::header::CONTENT_TYPE, http::header::HeaderValue::from_static("text/html")) .body(buf); - Ok(ErrorHandlerResponse::Response( - res.into_response(new_resp.into_body()), - )) + Ok(ErrorHandlerResponse::Response(res.into_response(new_resp.into_body()))) } fn livereload_handler() -> HttpResponse { @@ -192,23 +187,15 @@ pub fn serve( let broadcaster = if !watch_only { thread::spawn(move || { let s = HttpServer::new(move || { - let error_handlers = ErrorHandlers::new() - .handler(http::StatusCode::NOT_FOUND, not_found); + let error_handlers = + ErrorHandlers::new().handler(http::StatusCode::NOT_FOUND, not_found); App::new() - .data(ErrorFilePaths { - not_found: static_root.join("404.html"), - }) + .data(ErrorFilePaths { not_found: static_root.join("404.html") }) .wrap(error_handlers) - .route( - "/livereload.js", - web::get().to(livereload_handler) - ) + .route("/livereload.js", web::get().to(livereload_handler)) // Start a webserver that serves the `output_dir` directory - .service( - fs::Files::new("/", &static_root) - .index_file("index.html"), - ) + .service(fs::Files::new("/", &static_root).index_file("index.html")) }) .bind(&address) .expect("Can't start the webserver") @@ -272,7 +259,7 @@ pub fn serve( println!("Press Ctrl+C to stop\n"); // Delete the output folder on ctrl+C ctrlc::set_handler(move || { - let _ =remove_dir_all(&output_path); + let _ = remove_dir_all(&output_path); ::std::process::exit(0); }) .expect("Error setting Ctrl-C handler"); @@ -326,7 +313,12 @@ pub fn serve( } else { rebuild_done_handling( &broadcaster, - copy_file(&path, &site.output_path, &site.static_path, site.config.hard_link_static), + copy_file( + &path, + &site.output_path, + &site.static_path, + site.config.hard_link_static, + ), &partial_path.to_string_lossy(), ); } diff --git a/src/main.rs b/src/main.rs index 36eac2c..1af99df 100644 --- a/src/main.rs +++ b/src/main.rs @@ -74,7 +74,7 @@ fn main() { ::std::process::exit(1); } - if !watch_only && !port_is_available(port) { + if !watch_only && !port_is_available(port) { port = if let Some(p) = get_available_port(1111) { p } else { From 7e618684daba6072c487a3750192b59f96affbc9 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sat, 20 Jul 2019 16:09:16 +0200 Subject: [PATCH 29/67] Ensure public exists for search index Closes #756 --- components/site/src/lib.rs | 1 + docs/config.toml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/components/site/src/lib.rs b/components/site/src/lib.rs index 3a0829a..cd393e9 100644 --- a/components/site/src/lib.rs +++ b/components/site/src/lib.rs @@ -764,6 +764,7 @@ impl Site { } pub fn build_search_index(&self) -> Result<()> { + ensure_directory_exists(&self.output_path)?; // index first create_file( &self.output_path.join(&format!("search_index.{}.js", self.config.default_language)), diff --git a/docs/config.toml b/docs/config.toml index fc847ed..62cc309 100644 --- a/docs/config.toml +++ b/docs/config.toml @@ -7,7 +7,6 @@ highlight_code = true insert_anchor_links = true highlight_theme = "kronuz" build_search_index = true -# check_external_links = true [extra] author = "Vincent Prouillet" From 0cd9e58a86b94cab7c5e484e7a1c24ace3dca565 Mon Sep 17 00:00:00 2001 From: Thomas Hurst Date: Thu, 1 Aug 2019 09:17:38 +0100 Subject: [PATCH 30/67] Allow relative paths in new_file()/new_section() (#763) These functions expect that file_path can have base_path stripped from it, but during reloading they can be given relative paths. Maybe this behaviour varies between the notify backends? This fixes two zola serve panics on FreeBSD (poll backend). --- components/library/src/content/file_info.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/library/src/content/file_info.rs b/components/library/src/content/file_info.rs index 8d58ebe..0348a7f 100644 --- a/components/library/src/content/file_info.rs +++ b/components/library/src/content/file_info.rs @@ -57,7 +57,7 @@ impl FileInfo { let mut parent = file_path.parent().expect("Get parent of page").to_path_buf(); let name = path.file_stem().unwrap().to_string_lossy().to_string(); let mut components = find_content_components( - &file_path.strip_prefix(base_path).expect("Strip base path prefix for page"), + &file_path.strip_prefix(base_path).unwrap_or(&file_path), ); let relative = if !components.is_empty() { format!("{}/{}.md", components.join("/"), name) @@ -92,7 +92,7 @@ impl FileInfo { let parent = path.parent().expect("Get parent of section").to_path_buf(); let name = path.file_stem().unwrap().to_string_lossy().to_string(); let components = find_content_components( - &file_path.strip_prefix(base_path).expect("Strip base path prefix for section"), + &file_path.strip_prefix(base_path).unwrap_or(&file_path), ); let relative = if !components.is_empty() { format!("{}/{}.md", components.join("/"), name) From 4b43b75d22fb1b622c26282ce4ebf516317dd396 Mon Sep 17 00:00:00 2001 From: Pyry Kovanen Date: Thu, 1 Aug 2019 11:18:42 +0300 Subject: [PATCH 31/67] Allow ignored_content to support markdown files (#759) * Allow ignored_content to support markdown files * Add test for markdown supported ignored_content --- Cargo.toml | 1 + components/rebuild/src/lib.rs | 12 +++++++++++- components/site/src/lib.rs | 6 ++++++ components/site/tests/site.rs | 6 ++++++ src/cmd/serve.rs | 14 ++++++++++++++ test_site/config.toml | 2 ++ test_site/content/posts/ignored.md | 6 ++++++ 7 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 test_site/content/posts/ignored.md diff --git a/Cargo.toml b/Cargo.toml index 871ae75..ef25d83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,7 @@ notify = "4" ws = "0.8" ctrlc = "3" open = "1.2" +globset = "0.4" site = { path = "components/site" } errors = { path = "components/errors" } diff --git a/components/rebuild/src/lib.rs b/components/rebuild/src/lib.rs index 41b4fc4..f14ac5d 100644 --- a/components/rebuild/src/lib.rs +++ b/components/rebuild/src/lib.rs @@ -306,7 +306,17 @@ pub fn after_content_rename(site: &mut Site, old: &Path, new: &Path) -> Result<( old.to_path_buf() }; site.library.write().unwrap().remove_page(&old_path); - handle_page_editing(site, &new_path) + + let ignored_content_globset = site.config.ignored_content_globset.clone(); + let is_ignored_file = match ignored_content_globset { + Some(gs) => gs.is_match(new), + None => false + }; + + if !is_ignored_file { + return handle_page_editing(site, &new_path) + } + return Ok(()) } /// What happens when a section or a page is created/edited diff --git a/components/site/src/lib.rs b/components/site/src/lib.rs index cd393e9..910f892 100644 --- a/components/site/src/lib.rs +++ b/components/site/src/lib.rs @@ -210,6 +210,12 @@ impl Site { page_entries .into_par_iter() + .filter(|entry| { + match &config.ignored_content_globset { + Some(gs) => !gs.is_match(entry.as_path()), + None => true + } + }) .map(|entry| { let path = entry.as_path(); Page::from_file(path, config, &self.base_path) diff --git a/components/site/tests/site.rs b/components/site/tests/site.rs index bb5f8d4..c5288be 100644 --- a/components/site/tests/site.rs +++ b/components/site/tests/site.rs @@ -653,3 +653,9 @@ fn can_build_site_custom_builtins_from_theme() { assert!(file_exists!(public, "404.html")); assert!(file_contains!(public, "404.html", "Oops")); } + +#[test] +fn can_ignore_markdown_content() { + let (_, _tmp_dir, public) = build_site("test_site"); + assert!(!file_exists!(public, "posts/ignored/index.html")); +} diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs index 9768547..01d0767 100644 --- a/src/cmd/serve.rs +++ b/src/cmd/serve.rs @@ -21,6 +21,8 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +extern crate globset; + use std::env; use std::fs::{read_dir, remove_dir_all, File}; use std::io::Read; @@ -40,6 +42,7 @@ use ws::{Message, Sender, WebSocket}; use errors::{Error as ZolaError, Result}; use site::Site; use utils::fs::copy_file; +use cmd::serve::globset::GlobSet; use console; use open; @@ -345,6 +348,7 @@ pub fn serve( ); let start = Instant::now(); + match change_kind { ChangeKind::Content => { console::info(&format!("-> Content renamed {}", path.display())); @@ -376,6 +380,9 @@ pub fn serve( // Intellij does weird things on edit, chmod is there to count those changes // https://github.com/passcod/notify/issues/150#issuecomment-494912080 Create(path) | Write(path) | Remove(path) | Chmod(path) => { + if is_ignored_file(&site.config.ignored_content_globset, &path) { + continue; + } if is_temp_file(&path) || path.is_dir() { continue; } @@ -422,6 +429,13 @@ pub fn serve( } } +fn is_ignored_file(ignored_content_globset: &Option, path: &Path) -> bool { + match ignored_content_globset { + Some(gs) => gs.is_match(path), + None => false + } +} + /// Returns whether the path we received corresponds to a temp file created /// by an editor or the OS fn is_temp_file(path: &Path) -> bool { diff --git a/test_site/config.toml b/test_site/config.toml index 31cd7b1..08f32ab 100644 --- a/test_site/config.toml +++ b/test_site/config.toml @@ -11,5 +11,7 @@ taxonomies = [ extra_syntaxes = ["syntaxes"] +ignored_content = ["*/ignored.md"] + [extra.author] name = "Vincent Prouillet" diff --git a/test_site/content/posts/ignored.md b/test_site/content/posts/ignored.md new file mode 100644 index 0000000..54e0556 --- /dev/null +++ b/test_site/content/posts/ignored.md @@ -0,0 +1,6 @@ ++++ +title = "This should not be picked up" +date = 2019-07-23 ++++ + +Don't pick me up. From 0199017d07d1d378f2f93bebf486e4278346cde4 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sun, 4 Aug 2019 16:13:07 +0200 Subject: [PATCH 32/67] Slugify given slugs as well --- components/library/src/content/page.rs | 18 +++++++++++++++++- components/site/tests/site.rs | 18 +++++++++--------- components/site/tests/site_i18n.rs | 14 +++++++------- components/templates/src/builtins/rss.xml | 8 ++++---- components/templates/src/builtins/sitemap.xml | 2 +- test_site/content/posts/fixed-slug.md | 2 +- 6 files changed, 39 insertions(+), 23 deletions(-) diff --git a/components/library/src/content/page.rs b/components/library/src/content/page.rs index 934ba6f..4573357 100644 --- a/components/library/src/content/page.rs +++ b/components/library/src/content/page.rs @@ -160,7 +160,7 @@ impl Page { page.slug = { if let Some(ref slug) = page.meta.slug { - slug.trim().to_string() + slugify(&slug.trim()) } else if page.file.name == "index" { if let Some(parent) = page.file.path.parent() { if let Some(slug) = slug_from_dated_filename { @@ -437,6 +437,22 @@ Hello world"#; assert_eq!(page.permalink, config.make_permalink("hello-world")); } + #[test] + fn can_make_url_from_slug_only_with_no_special_chars() { + let content = r#" + +++ + slug = "hello-&-world" + +++ + Hello world"#; + let config = Config::default(); + let res = Page::parse(Path::new("start.md"), content, &config, &PathBuf::new()); + assert!(res.is_ok()); + let page = res.unwrap(); + assert_eq!(page.path, "hello-world/"); + assert_eq!(page.components, vec!["hello-world"]); + assert_eq!(page.permalink, config.make_permalink("hello-world")); + } + #[test] fn can_make_url_from_path() { let content = r#" diff --git a/components/site/tests/site.rs b/components/site/tests/site.rs index c5288be..015f6ca 100644 --- a/components/site/tests/site.rs +++ b/components/site/tests/site.rs @@ -167,12 +167,12 @@ fn can_build_site_without_live_reload() { assert!(file_contains!( public, "sitemap.xml", - "https%3A//replace-this-with-your-url.com/posts/simple/" + "https://replace-this-with-your-url.com/posts/simple/" )); assert!(file_contains!( public, "sitemap.xml", - "https%3A//replace-this-with-your-url.com/posts/" + "https://replace-this-with-your-url.com/posts/" )); // Drafts are not in the sitemap assert!(!file_contains!(public, "sitemap.xml", "draft")); @@ -280,7 +280,7 @@ fn can_build_site_with_taxonomies() { assert!(file_contains!( public, "categories/a/rss.xml", - "https%3A//replace-this-with-your-url.com/categories/a/rss.xml" + "https://replace-this-with-your-url.com/categories/a/rss.xml" )); // Extending from a theme works assert!(file_contains!(public, "categories/a/index.html", "EXTENDED")); @@ -291,12 +291,12 @@ fn can_build_site_with_taxonomies() { assert!(file_contains!( public, "sitemap.xml", - "https%3A//replace-this-with-your-url.com/categories/" + "https://replace-this-with-your-url.com/categories/" )); assert!(file_contains!( public, "sitemap.xml", - "https%3A//replace-this-with-your-url.com/categories/a/" + "https://replace-this-with-your-url.com/categories/a/" )); } @@ -425,7 +425,7 @@ fn can_build_site_with_pagination_for_section() { assert!(file_contains!( public, "sitemap.xml", - "https%3A//replace-this-with-your-url.com/posts/page/4/" + "https://replace-this-with-your-url.com/posts/page/4/" )); } @@ -478,7 +478,7 @@ fn can_build_site_with_pagination_for_index() { assert!(file_contains!( public, "sitemap.xml", - "https%3A//replace-this-with-your-url.com/page/1/" + "https://replace-this-with-your-url.com/page/1/" )) } @@ -559,7 +559,7 @@ fn can_build_site_with_pagination_for_taxonomy() { assert!(file_contains!( public, "sitemap.xml", - "https%3A//replace-this-with-your-url.com/tags/a/page/6/" + "https://replace-this-with-your-url.com/tags/a/page/6/" )) } @@ -643,7 +643,7 @@ fn can_apply_page_templates() { assert_eq!(child.meta.title, Some("Local section override".into())); } -// https%3A//github.com/getzola/zola/issues/571 +// https://github.com/getzola/zola/issues/571 #[test] fn can_build_site_custom_builtins_from_theme() { let (_, _tmp_dir, public) = build_site("test_site"); diff --git a/components/site/tests/site_i18n.rs b/components/site/tests/site_i18n.rs index 2ba1b10..2f81c7c 100644 --- a/components/site/tests/site_i18n.rs +++ b/components/site/tests/site_i18n.rs @@ -112,17 +112,17 @@ fn can_build_multilingual_site() { // sitemap contains all languages assert!(file_exists!(public, "sitemap.xml")); - assert!(file_contains!(public, "sitemap.xml", "https%3A//example.com/blog/something-else/")); - assert!(file_contains!(public, "sitemap.xml", "https%3A//example.com/fr/blog/something-else/")); - assert!(file_contains!(public, "sitemap.xml", "https%3A//example.com/it/blog/something-else/")); + assert!(file_contains!(public, "sitemap.xml", "https://example.com/blog/something-else/")); + assert!(file_contains!(public, "sitemap.xml", "https://example.com/fr/blog/something-else/")); + assert!(file_contains!(public, "sitemap.xml", "https://example.com/it/blog/something-else/")); // one rss per language assert!(file_exists!(public, "rss.xml")); - assert!(file_contains!(public, "rss.xml", "https%3A//example.com/blog/something-else/")); - assert!(!file_contains!(public, "rss.xml", "https%3A//example.com/fr/blog/something-else/")); + assert!(file_contains!(public, "rss.xml", "https://example.com/blog/something-else/")); + assert!(!file_contains!(public, "rss.xml", "https://example.com/fr/blog/something-else/")); assert!(file_exists!(public, "fr/rss.xml")); - assert!(!file_contains!(public, "fr/rss.xml", "https%3A//example.com/blog/something-else/")); - assert!(file_contains!(public, "fr/rss.xml", "https%3A//example.com/fr/blog/something-else/")); + assert!(!file_contains!(public, "fr/rss.xml", "https://example.com/blog/something-else/")); + assert!(file_contains!(public, "fr/rss.xml", "https://example.com/fr/blog/something-else/")); // Italian doesn't have RSS enabled assert!(!file_exists!(public, "it/rss.xml")); diff --git a/components/templates/src/builtins/rss.xml b/components/templates/src/builtins/rss.xml index 3d5e909..8f88973 100644 --- a/components/templates/src/builtins/rss.xml +++ b/components/templates/src/builtins/rss.xml @@ -2,18 +2,18 @@ {{ config.title }} - {{ config.base_url | urlencode | safe }} + {{ config.base_url | safe }} {{ config.description }} Zola {{ config.default_language }} - + {{ last_build_date | date(format="%a, %d %b %Y %H:%M:%S %z") }} {% for page in pages %} {{ page.title }} {{ page.date | date(format="%a, %d %b %Y %H:%M:%S %z") }} - {{ page.permalink | urlencode | safe }} - {{ page.permalink | urlencode | safe }} + {{ page.permalink | safe }} + {{ page.permalink | safe }} {% if page.summary %}{{ page.summary }}{% else %}{{ page.content }}{% endif %} {% endfor %} diff --git a/components/templates/src/builtins/sitemap.xml b/components/templates/src/builtins/sitemap.xml index 7186e53..171ae2e 100644 --- a/components/templates/src/builtins/sitemap.xml +++ b/components/templates/src/builtins/sitemap.xml @@ -2,7 +2,7 @@ {% for sitemap_entry in entries %} - {{ sitemap_entry.permalink | urlencode | safe }} + {{ sitemap_entry.permalink | safe }} {% if sitemap_entry.date %} {{ sitemap_entry.date }} {% endif %} diff --git a/test_site/content/posts/fixed-slug.md b/test_site/content/posts/fixed-slug.md index afec24b..6bac415 100644 --- a/test_site/content/posts/fixed-slug.md +++ b/test_site/content/posts/fixed-slug.md @@ -1,7 +1,7 @@ +++ title = "Fixed slug" description = "" -slug = "something-else" +slug = "something-&-else" date = 2017-01-01 aliases = ["/an-old-url/old-page", "/an-old-url/an-old-alias.html"] +++ From 17de9b6a3664160b6322556f0b155697da49a198 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sun, 4 Aug 2019 16:16:43 +0200 Subject: [PATCH 33/67] Update deps --- Cargo.lock | 663 +++++++++++++++++++++++++++-------------------------- 1 file changed, 332 insertions(+), 331 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a49892..7df9d5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,24 +7,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "actix-connect" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "trust-dns-resolver 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -32,34 +32,34 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-web 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "actix-http" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-connect 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-server-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-connect 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -70,19 +70,19 @@ dependencies = [ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", + "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -100,19 +100,20 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "actix-rt" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -122,14 +123,14 @@ dependencies = [ [[package]] name = "actix-server" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-rt 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-server-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -143,7 +144,7 @@ dependencies = [ [[package]] name = "actix-server-config" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", @@ -167,7 +168,7 @@ dependencies = [ "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -175,7 +176,7 @@ dependencies = [ [[package]] name = "actix-utils" -version = "0.4.2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -183,37 +184,37 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "actix-web" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-server 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-server-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -226,7 +227,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -236,7 +237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "aho-corasick" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -265,7 +266,7 @@ dependencies = [ [[package]] name = "arc-swap" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -278,7 +279,7 @@ dependencies = [ [[package]] name = "atty" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", @@ -287,15 +288,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "backtrace" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", + "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.60 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -303,10 +304,10 @@ dependencies = [ [[package]] name = "backtrace-sys" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -323,9 +324,9 @@ name = "bincode" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (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.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -354,13 +355,13 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.2" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-automata 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -394,7 +395,7 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -410,7 +411,7 @@ dependencies = [ "libc 0.2.60 (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)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -420,7 +421,7 @@ version = "2.33.0" 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.12 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -449,8 +450,8 @@ dependencies = [ "errors 0.1.0", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -473,9 +474,9 @@ dependencies = [ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -511,11 +512,10 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -523,8 +523,8 @@ name = "crossbeam-deque" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -532,21 +532,21 @@ name = "crossbeam-deque" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-epoch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -554,12 +554,12 @@ name = "crossbeam-queue" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-utils" -version = "0.6.5" +version = "0.6.6" 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)", @@ -571,11 +571,11 @@ name = "csv" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bstr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "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.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -612,7 +612,7 @@ 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)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -623,9 +623,9 @@ dependencies = [ "lazy_static 1.3.0 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -657,10 +657,10 @@ version = "2.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rust-stemmers 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -738,7 +738,7 @@ 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.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -746,7 +746,7 @@ name = "error-chain" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -765,7 +765,7 @@ name = "failure" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -776,7 +776,7 @@ 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.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -803,7 +803,7 @@ dependencies = [ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (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_c_api 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -831,9 +831,9 @@ dependencies = [ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -921,10 +921,10 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (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.60 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -947,11 +947,11 @@ name = "globset" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bstr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", + "bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -959,22 +959,22 @@ name = "globwalk" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ignore 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "ignore 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "h2" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1007,17 +1007,17 @@ name = "html5ever" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "markup5ever 0.8.1 (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)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "http" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1032,7 +1032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1062,13 +1062,13 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1107,18 +1107,18 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1147,7 +1147,7 @@ dependencies = [ "image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -1197,10 +1197,10 @@ name = "ipconfig" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "socket2 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", "widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winreg 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1235,9 +1235,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "lazy_static" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "lazycell" @@ -1260,10 +1257,10 @@ dependencies = [ "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rendering 0.1.0", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "slotmap 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1277,7 +1274,7 @@ name = "line-wrap" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1285,7 +1282,7 @@ name = "link_checker" version = "0.1.0" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1310,9 +1307,17 @@ dependencies = [ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "lock_api" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "log" -version = "0.4.7" +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)", @@ -1346,11 +1351,11 @@ name = "markup5ever" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1372,8 +1377,11 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.2.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "mime" @@ -1385,13 +1393,11 @@ dependencies = [ [[package]] name = "mime_guess" -version = "2.0.0-alpha.6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1399,13 +1405,13 @@ name = "miniz-sys" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "miniz_oxide" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1413,13 +1419,13 @@ dependencies = [ [[package]] name = "miniz_oxide_c_api" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.38 (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.60 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1432,7 +1438,7 @@ dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1445,7 +1451,7 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1478,10 +1484,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.10.23 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.47 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1509,7 +1515,7 @@ version = "0.14.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)", - "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.38 (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.60 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1543,7 +1549,7 @@ dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1554,7 +1560,7 @@ 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.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1562,7 +1568,7 @@ name = "num-integer" version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1571,7 +1577,7 @@ name = "num-iter" version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (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)", ] @@ -1581,7 +1587,7 @@ name = "num-rational" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (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)", ] @@ -1591,7 +1597,7 @@ name = "num-traits" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1618,18 +1624,18 @@ name = "onig_sys" version = "69.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "opaque-debug" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "open" -version = "1.2.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1637,7 +1643,7 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.23" +version = "0.10.24" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1645,7 +1651,7 @@ dependencies = [ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.47 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1655,13 +1661,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "openssl-sys" -version = "0.9.47" +version = "0.9.48" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (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)", ] @@ -1692,6 +1698,16 @@ dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "parking_lot" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "parking_lot_core" version = "0.4.0" @@ -1719,6 +1735,20 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "parking_lot_core" +version = "0.6.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)", + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "percent-encoding" version = "1.0.1" @@ -1729,7 +1759,7 @@ name = "pest" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1750,7 +1780,7 @@ dependencies = [ "pest_meta 2.1.1 (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)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1795,12 +1825,11 @@ version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pkg-config" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1812,7 +1841,7 @@ dependencies = [ "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)", "line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1853,13 +1882,13 @@ dependencies = [ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pulldown-cmark" -version = "0.5.2" +version = "0.5.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)", @@ -1886,7 +1915,7 @@ name = "rand" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1904,9 +1933,9 @@ name = "rand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1916,16 +1945,15 @@ name = "rand_chacha" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand_chacha" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1948,7 +1976,7 @@ name = "rand_core" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2003,7 +2031,7 @@ name = "rand_pcg" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2032,7 +2060,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2064,19 +2092,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "regex" -version = "1.1.9" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8-ranges 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-automata" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2084,11 +2111,8 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "remove_dir_all" @@ -2109,10 +2133,10 @@ dependencies = [ "link_checker 0.1.0", "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pulldown-cmark 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", @@ -2122,7 +2146,7 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.9.18" +version = "0.9.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2132,14 +2156,14 @@ dependencies = [ "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2150,6 +2174,7 @@ dependencies = [ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2166,8 +2191,8 @@ name = "rust-stemmers" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2190,12 +2215,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "safemem" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "same-file" -version = "1.0.4" +version = "1.0.5" 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)", @@ -2215,10 +2240,10 @@ name = "sass-sys" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2290,20 +2315,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.94" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.94" +version = "1.0.98" 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.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2314,7 +2339,7 @@ dependencies = [ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "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.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2324,7 +2349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2336,7 +2361,7 @@ dependencies = [ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2350,15 +2375,15 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "signal-hook-registry 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "signal-hook-registry" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "arc-swap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2381,8 +2406,8 @@ dependencies = [ "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "search 0.1.0", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2414,7 +2439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "socket2" -version = "0.3.9" +version = "0.3.10" 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)", @@ -2423,11 +2448,6 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "spin" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "stable_deref_trait" version = "1.1.1" @@ -2450,7 +2470,7 @@ dependencies = [ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2490,12 +2510,12 @@ dependencies = [ "heck 0.3.1 (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)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syn" -version = "0.15.39" +version = "0.15.42" 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)", @@ -2510,7 +2530,7 @@ 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.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2527,11 +2547,11 @@ dependencies = [ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "onig 4.3.2 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2560,8 +2580,8 @@ dependencies = [ "imageproc 0.1.0", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "library 0.1.0", - "pulldown-cmark 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)", + "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2590,8 +2610,8 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "unic-segment 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2703,7 +2723,7 @@ name = "tokio-executor" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2714,7 +2734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2722,10 +2742,10 @@ name = "tokio-reactor" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2780,9 +2800,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2794,7 +2814,7 @@ name = "tokio-timer" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2807,7 +2827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2819,7 +2839,7 @@ name = "toml" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2833,10 +2853,10 @@ dependencies = [ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "socket2 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2856,7 +2876,7 @@ dependencies = [ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2884,12 +2904,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ucd-trie" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "ucd-util" -version = "0.1.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2936,14 +2951,6 @@ dependencies = [ "unic-common 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "unicase" -version = "1.4.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)", -] - [[package]] name = "unicase" version = "2.4.0" @@ -2999,22 +3006,17 @@ name = "utf-8" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "utf8-ranges" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "utils" version = "0.1.0" dependencies = [ "errors 0.1.0", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3042,7 +3044,7 @@ dependencies = [ "nom 4.2.3 (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)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3076,10 +3078,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "walkdir" -version = "2.2.8" +version = "2.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3090,7 +3092,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3147,7 +3149,7 @@ dependencies = [ [[package]] name = "winreg" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3169,7 +3171,7 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3204,9 +3206,9 @@ dependencies = [ name = "zola" version = "0.9.0" dependencies = [ - "actix-files 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-web 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3214,7 +3216,7 @@ dependencies = [ "front_matter 0.1.0", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)", - "open 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "open 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rebuild 0.1.0", "site 0.1.0", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3226,39 +3228,39 @@ dependencies = [ [metadata] "checksum actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2c11af4b06dc935d8e1b1491dad56bfb32febc49096a91e773f8535c176453" -"checksum actix-connect 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d7fbab0d79b2f3415a79570e3db12eaa75c26239541e613b832655145a5e9488" -"checksum actix-files 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "537717457cf4e00fccc5779111c61553eb57565d98fdb86d18d63cea3cf1a0c7" -"checksum actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "29c11d33772c790e9aeb2e024834bc084f7496598482908e2424efd768c912b6" +"checksum actix-connect 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "818f0901d2188c8c75a489c42db6e8d9e1b020f0ca2baaa4c940e08e1817eed0" +"checksum actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e4640b28cd96059541c932f6f350c63c76688e43d68305cdb88e0004da12b5" +"checksum actix-http 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4d45d3f033fb7ff73467dad0ef1d12afb532b39953d50f4124f4d89451670583" "checksum actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "23224bb527e204261d0291102cb9b52713084def67d94f7874923baefe04ccf7" -"checksum actix-rt 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61e09627004cb25149fd177c4a062d2061c4ec40aae5820ecd37a87195e759f8" -"checksum actix-server 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ba8c936356c882420eab87051b12ca1926dc42348863d05fff7eb151df9cddbb" -"checksum actix-server-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e78703f07d0bd08b426b482d53569d84f1e1929024f0431b3a5a2dc0c1c60e0f" +"checksum actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "18d9054b1cfacfa441846b9b99001010cb8fbb02130e6cfdb25cea36d3e98e87" +"checksum actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb3038e9e457e0a498ea682723e0f4e6cc2c4f362a1868d749808355275ad959" +"checksum actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "483a34989c682d93142bacad6300375bb6ad8002d2e0bb249dbad86128b9ff30" "checksum actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaecc01bbc595ebd7a563a7d4f8a607d0b964bb55273c6f362b0b02c26508cf2" "checksum actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c29f7c554d56b3841f4bb85d5b3dee01ba536e1307679f56eb54de28aaec3fb" -"checksum actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b307201d074c963041cd8858d6b6a82ca23369827d613da5d6e972de123d3c14" -"checksum actix-web 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0dc7ab62d04b9eeb0f368ad9c6ee20c2e3541fb9a25a5eb727c9118b59e8ff2" +"checksum actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea501068a0173533704be321f149853f702d9e3c3ce9d57e7a96d94b1ab5aca" +"checksum actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0147b2fd52ced64145c8370af627f12f098222a1c6ba67d021e21cd0d806f574" "checksum actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe9e3cdec1e645b675f354766e0688c5705021c85ab3cf739be1c8999b91c76" "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" -"checksum aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282" +"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" "checksum ammonia 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "384d704f242a0a9faf793fff775a0be6ab9aa27edabffa097331d73779142520" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841" +"checksum arc-swap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e43c468bcaa343ddcad9e46806e066e39f62434898b20f5af21261da910d5c7" "checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" -"checksum atty 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ecaaea69f52b3b18633611ec0007d188517d0366f47ff703d400fa6879d6f8d5" -"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" -"checksum backtrace 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "18b50f5258d1a9ad8396d2d345827875de4261b158124d4c819d9b351454fae5" -"checksum backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3a000b9c543553af61bc01cbfc403b04b5caa9e421033866f2e98061eb3e61" +"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" +"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" +"checksum backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)" = "b5164d292487f037ece34ec0de2fcede2faa162f085dd96d2385ab81b12765ba" +"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" "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 bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" "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 bstr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fc0662252f9bba48c251a16d16a768b9fcd959593bde07544710bce6efe60b7a" +"checksum bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e0a692f1c740e7e821ca71a22cf99b9b2322dfa94d10f71443befb1797b3946a" "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 bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" +"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" "checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" @@ -3270,12 +3272,12 @@ dependencies = [ "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -"checksum crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b" +"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13" "checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4" +"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" -"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" +"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" "checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d" "checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c" "checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" @@ -3316,17 +3318,17 @@ dependencies = [ "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "72327b15c228bfe31f1390f93dd5e9279587f0463836393c9df719ce62a3e450" -"checksum getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e65cce4e5084b14874c4e7097f38cab54f47ee554f9194673456ea379dcc4c55" +"checksum getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8e190892c840661957ba9f32dacfb3eb405e657f9f9f60485605f0bb37d6f8" "checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" "checksum globwalk 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "53cbcf0368596897b0a3b8ff2110acf2400e80ffad4ca9238b52ff282a9b267b" -"checksum h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "a539b63339fbbb00e081e84b6e11bd1d9634a82d91da2984a18ac74a8823f392" +"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" "checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e" "checksum html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ce65ac8028cf5a287a7dbf6c4e0a6cf2dcf022ed5b167a81bae66ebf599a8b7" -"checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a" +"checksum http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "372bcb56f939e449117fb0869c2e8fd8753a8223d92a172c6e808cf123a5b6e4" "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" "checksum humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" @@ -3334,7 +3336,7 @@ dependencies = [ "checksum hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)" = "7cb44cbce9d8ee4fb36e4c0ad7b794ac44ebaad924b9c8291a63215bb44c2c8f" "checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -"checksum ignore 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8dc57fa12805f367736a38541ac1a9fc6a52812a0ca959b1d4d4b640a89eb002" +"checksum ignore 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5d66819194c2b95fe5549e0dd76a9ab811740cb8b57e187e6c60ccf992faf19b" "checksum image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "99198e595d012efccf12abf4abc08da2d97be0b0355a2b08d101347527476ba4" "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" "checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" @@ -3353,7 +3355,8 @@ dependencies = [ "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" "checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" -"checksum log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3" +"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" +"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" "checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" @@ -3361,12 +3364,12 @@ dependencies = [ "checksum markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f1af46a727284117e09780d05038b1ce6fc9c76cc6df183c3dae5a8955a25e21" "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 memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" +"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" -"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed" +"checksum mime_guess 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d729cf45eaf996831fe7143af04190187ab3ee2a72ea96bd00958d1fae822a9d" "checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" -"checksum miniz_oxide 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b6c3756d66cf286314d5f7ebe74886188a9a92f5eee68b06f31ac2b4f314c99d" -"checksum miniz_oxide_c_api 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5b78ca5446dd9fe0dab00e058731b6b08a8c1d2b9cdb8efb10876e24e9ae2494" +"checksum miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c061edee74a88eb35d876ce88b94d77a0448a201de111c244b70d047f5820516" +"checksum miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4" "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" @@ -3386,16 +3389,18 @@ dependencies = [ "checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" "checksum onig 4.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a646989adad8a19f49be2090374712931c3a59835cb5277b4530f48b417f26e7" "checksum onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388410bf5fa341f10e58e6db3975f4bea1ac30247dd79d37a9e5ced3cb4cc3b0" -"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" -"checksum open 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "02bbc4c56e3254b7717562db189ef6a327e29842d79402123a018c1fde065dfc" -"checksum openssl 0.10.23 (registry+https://github.com/rust-lang/crates.io-index)" = "97c140cbb82f3b3468193dd14c1b88def39f341f68257f8a7fe8ed9ed3f628a5" +"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +"checksum open 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9d2c4abda3b735c6c456cee452c08483669408284da14f0551ce8c9e09d2e05f" +"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -"checksum openssl-sys 0.9.47 (registry+https://github.com/rust-lang/crates.io-index)" = "75bdd6dbbb4958d38e47a1d2348847ad1eb4dc205dc5d37473ae504391865acc" +"checksum openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)" = "b5ba300217253bcc5dc68bed23d782affa45000193866e025329aa8a7a9f05b8" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" "checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" +"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" "checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c" +"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" "checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" @@ -3405,20 +3410,20 @@ dependencies = [ "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" +"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" "checksum plist 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a9f075f6394100e7c105ed1af73fb1859d6fd14e49d4290d578120beb167f" "checksum png 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "63daf481fdd0defa2d1d2be15c674fbfa1b0fd71882c303a91f9a79b3252c359" "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d" -"checksum pulldown-cmark 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "051e60ace841b3bfecd402fe5051c06cb3bec4a6e6fdd060a37aa8eb829a1db3" +"checksum pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" "checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -"checksum rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e193067942ef6f485a349a113329140d0ab9e2168ce92274499bb0e9a4190d9d" +"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" "checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" @@ -3433,18 +3438,18 @@ dependencies = [ "checksum rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe0df8435ac0c397d467b6cad6d25543d06e8a019ef3f6af3c384597515bd2" "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 regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad" -"checksum regex-automata 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ed09217220c272b29ef237a974ad58515bde75f194e3ffa7e6d0bf0f3b01f86" -"checksum regex-syntax 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9b01330cce219c1c6b2e209e5ed64ccd587ae5c67bed91c0b49eecf02ae40e21" +"checksum regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26" +"checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9" +"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -"checksum reqwest 0.9.18 (registry+https://github.com/rust-lang/crates.io-index)" = "00eb63f212df0e358b427f0f40aa13aaea010b470be642ad422bcbca2feff2e4" +"checksum reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0777154c2c3eb54f5c480db01de845652d941e47191277cc673634c3853939" "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb" "checksum rust-stemmers 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05928c187b85b38f6b98db43057a24f0245163635a5ce6325a4f77a833d646aa" "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" -"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" -"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" +"checksum safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e133ccc4f4d1cd4f89cc8a7ff618287d56dc7f638b8e38fc32c5fdcadc339dd5" +"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" "checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd" "checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972" "checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" @@ -3455,21 +3460,20 @@ dependencies = [ "checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)" = "076a696fdea89c19d3baed462576b8f6d663064414b5c793642da8dfeb99475b" -"checksum serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)" = "ef45eb79d6463b22f5f9e16d283798b7c0175ba6050bc25c1a946c122727fe7b" +"checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113" +"checksum serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "01e69e1b8a631f245467ee275b8c757b818653c6d704cdbcaeb56b56767b529c" "checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" "checksum signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68" -"checksum signal-hook-registry 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cded4ffa32146722ec54ab1f16320568465aa922aa9ab4708129599740da85d7" +"checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum slotmap 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4ed041f7f2ff35f2bf7d688bf30686976512f8300e37433c2c73ea9f4cf14b" "checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" -"checksum socket2 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "4e626972d3593207547f14bf5fc9efa4d0e7283deb73fef1dff313dae9ab8878" -"checksum spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55" +"checksum socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df028e0e632c2a1823d920ad74895e7f9128e6438cbc4bc6fd1f180e644767b9" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" "checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423" @@ -3478,7 +3482,7 @@ dependencies = [ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" -"checksum syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d960b829a55e56db167e861ddb43602c003c7be0bee1d345021703fac2fb7c" +"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" @@ -3509,15 +3513,13 @@ dependencies = [ "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" "checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" -"checksum ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "71a9c5b1fe77426cf144cc30e49e955270f5086e31a6441dfa8b32efc09b9d77" -"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" +"checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2" "checksum unic-char-property 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" "checksum unic-char-range 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" "checksum unic-common 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" "checksum unic-segment 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" "checksum unic-ucd-segment 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" "checksum unic-ucd-version 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" "checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" "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" @@ -3526,7 +3528,6 @@ dependencies = [ "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" "checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" -"checksum utf8-ranges 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9d50aa7650df78abf942826607c62468ce18d9019673d4a2ebe1865dbb96ffde" "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" "checksum v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8865501b78eef9193c1b45486acf18ba889e5662eba98854d6fc59d8ecf3542d" "checksum v_escape_derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "306896ff4b75998501263a1dc000456de442e21d68fe8c8bdf75c66a33a58e23" @@ -3535,7 +3536,7 @@ dependencies = [ "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 void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -"checksum walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c7904a7e2bb3cdf0cf5e783f44204a85a37a93151738fa349f06680f59a98b45" +"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" @@ -3545,7 +3546,7 @@ dependencies = [ "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" "checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" -"checksum winreg 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "daf67b95d0b1bf421c4f11048d63110ca3719977169eec86396b614c8942b6e0" +"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" "checksum ws 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ec91ea61b83ce033c43c06c52ddc7532f465c0153281610d44c58b74083aee1a" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" From b9a5cb3d14056879ca8388dbe4db623da9d765ae Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Mon, 5 Aug 2019 22:43:32 +0200 Subject: [PATCH 34/67] Min version is now 1.35 it seems --- Cargo.lock | 1 + azure-pipelines.yml | 4 ++-- snapcraft.yaml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7df9d5c..1b1a53e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3214,6 +3214,7 @@ dependencies = [ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", "front_matter 0.1.0", + "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fcbe8cb..6109f53 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,9 +19,9 @@ stages: linux-stable: imageName: 'ubuntu-16.04' rustup_toolchain: stable - linux-1.34: + linux-1.35: imageName: 'ubuntu-16.04' - rustup_toolchain: 1.34.0 + rustup_toolchain: 1.35.0 pool: vmImage: $(imageName) steps: diff --git a/snapcraft.yaml b/snapcraft.yaml index c8a8624..f099c8f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: zola -version: 0.8.0 +version: 0.9.0 summary: A fast static site generator in a single binary with everything built-in. description: | A fast static site generator in a single binary with everything built-in. @@ -21,7 +21,7 @@ parts: zola: source-type: git source: https://github.com/getzola/zola.git - source-tag: v0.8.0 + source-tag: v0.9.0 plugin: rust rust-channel: stable build-packages: From e74dab535d4df617f6362d1d33b70b5f4ab6030e Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Thu, 8 Aug 2019 00:37:37 +0200 Subject: [PATCH 35/67] Update deps & re-render on anchor-link.html changes Closes #719 --- CHANGELOG.md | 5 +- Cargo.lock | 172 ++++++++++++++------------------ Cargo.toml | 4 +- components/errors/Cargo.toml | 2 +- components/imageproc/Cargo.toml | 2 +- components/rebuild/src/lib.rs | 4 +- components/search/Cargo.toml | 2 +- components/templates/Cargo.toml | 4 +- 8 files changed, 89 insertions(+), 106 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d90361..287f88e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,12 @@ ### Other - Add `--open` flag to open server URL in default browser -- Fix sitemaps namespace +- Fix sitemaps namespace & do not urlencode URLs - Update livereload - Add `hard_link_static` config option to hard link things in the static directory instead of copying - Add warning for old style internal links since they would still function silently -- Add some counts to `zola check` +- Print some counts when running `zola check` +- Re-render all pages/sections when `anchor-link.html` is changed ## 0.8.0 (2019-06-22) diff --git a/Cargo.lock b/Cargo.lock index 1b1a53e..554e04f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ [[package]] name = "actix-connect" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -44,7 +44,7 @@ dependencies = [ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -55,10 +55,10 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-connect 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-connect 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -112,7 +112,7 @@ name = "actix-rt" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -162,15 +162,15 @@ dependencies = [ [[package]] name = "actix-threadpool" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 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)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -201,7 +201,7 @@ dependencies = [ "actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -245,15 +245,15 @@ dependencies = [ [[package]] name = "ammonia" -version = "2.1.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -266,7 +266,7 @@ dependencies = [ [[package]] name = "arc-swap" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -604,17 +604,6 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "derive_more" -version = "0.14.1" -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)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "derive_more" version = "0.15.0" @@ -754,7 +743,7 @@ dependencies = [ name = "errors" version = "0.1.0" dependencies = [ - "image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -921,7 +910,7 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.7" +version = "0.1.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)", @@ -1004,12 +993,12 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "markup5ever 0.9.0 (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)", "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1105,6 +1094,16 @@ dependencies = [ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "idna" +version = "0.2.0" +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)", +] + [[package]] name = "ignore" version = "0.4.9" @@ -1124,7 +1123,7 @@ dependencies = [ [[package]] name = "image" -version = "0.21.2" +version = "0.22.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)", @@ -1134,9 +1133,9 @@ dependencies = [ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "tiff 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1144,7 +1143,7 @@ name = "imageproc" version = "0.1.0" dependencies = [ "errors 0.1.0", - "image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1299,14 +1298,6 @@ dependencies = [ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "lock_api" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "lock_api" version = "0.3.1" @@ -1348,7 +1339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "markup5ever" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1393,7 +1384,7 @@ dependencies = [ [[package]] name = "mime_guess" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1688,16 +1679,6 @@ dependencies = [ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "parking_lot" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "parking_lot" version = "0.9.0" @@ -1722,13 +1703,12 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.5.0" +version = "0.6.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)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1736,22 +1716,13 @@ dependencies = [ ] [[package]] -name = "parking_lot_core" -version = "0.6.2" +name = "percent-encoding" +version = "1.0.1" 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)", - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "percent-encoding" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1847,13 +1818,13 @@ dependencies = [ [[package]] name = "png" -version = "0.14.1" +version = "0.15.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)", + "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1933,7 +1904,7 @@ name = "rand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1976,7 +1947,7 @@ name = "rand_core" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2161,7 +2132,7 @@ dependencies = [ "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2274,7 +2245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "search" version = "0.1.0" dependencies = [ - "ammonia 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ammonia 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "elasticlunr-rs 2.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2383,7 +2354,7 @@ name = "signal-hook-registry" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arc-swap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "arc-swap 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2576,7 +2547,7 @@ dependencies = [ "config 0.1.0", "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", - "image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", "imageproc 0.1.0", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "library 0.1.0", @@ -2585,7 +2556,7 @@ dependencies = [ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -2652,7 +2623,7 @@ dependencies = [ [[package]] name = "tiff" -version = "0.2.2" +version = "0.3.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)", @@ -3001,6 +2972,16 @@ dependencies = [ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "url" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "utf-8" version = "0.7.5" @@ -3165,7 +3146,7 @@ dependencies = [ [[package]] name = "ws" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3177,7 +3158,7 @@ dependencies = [ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3222,14 +3203,14 @@ dependencies = [ "site 0.1.0", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", - "ws 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ws 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] "checksum actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2c11af4b06dc935d8e1b1491dad56bfb32febc49096a91e773f8535c176453" -"checksum actix-connect 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "818f0901d2188c8c75a489c42db6e8d9e1b020f0ca2baaa4c940e08e1817eed0" +"checksum actix-connect 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "646be02316c497d1cb8b1ed82eb723b052d6b3e2462c94bd52d0ac2d4a29a165" "checksum actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e4640b28cd96059541c932f6f350c63c76688e43d68305cdb88e0004da12b5" "checksum actix-http 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4d45d3f033fb7ff73467dad0ef1d12afb532b39953d50f4124f4d89451670583" "checksum actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "23224bb527e204261d0291102cb9b52713084def67d94f7874923baefe04ccf7" @@ -3237,15 +3218,15 @@ dependencies = [ "checksum actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb3038e9e457e0a498ea682723e0f4e6cc2c4f362a1868d749808355275ad959" "checksum actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "483a34989c682d93142bacad6300375bb6ad8002d2e0bb249dbad86128b9ff30" "checksum actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaecc01bbc595ebd7a563a7d4f8a607d0b964bb55273c6f362b0b02c26508cf2" -"checksum actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c29f7c554d56b3841f4bb85d5b3dee01ba536e1307679f56eb54de28aaec3fb" +"checksum actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b5ae85d13da7e6fb86b1b7bc83185e0e3bd4cc5f421c887e1803796c034d35d" "checksum actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea501068a0173533704be321f149853f702d9e3c3ce9d57e7a96d94b1ab5aca" "checksum actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0147b2fd52ced64145c8370af627f12f098222a1c6ba67d021e21cd0d806f574" "checksum actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe9e3cdec1e645b675f354766e0688c5705021c85ab3cf739be1c8999b91c76" "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 ammonia 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "384d704f242a0a9faf793fff775a0be6ab9aa27edabffa097331d73779142520" +"checksum ammonia 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9e266e1f4be5ffa05309f650e2586fe1d3ae6034eb24025a7ae1dfecc330823a" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum arc-swap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e43c468bcaa343ddcad9e46806e066e39f62434898b20f5af21261da910d5c7" +"checksum arc-swap 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1507f9b80b3ef096751728cf3f43bb0111ec906e44f5d8587e02c10643b9a2cd" "checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" "checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" @@ -3283,7 +3264,6 @@ dependencies = [ "checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c" "checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -"checksum derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6d944ac6003ed268757ef1ee686753b57efc5fcf0ebe7b64c9fc81e7e32ff839" "checksum derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a141330240c921ec6d074a3e188a7c7ef95668bb95e7d44fa0e5778ec2a7afe" "checksum deunicode 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" @@ -3319,7 +3299,7 @@ dependencies = [ "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "72327b15c228bfe31f1390f93dd5e9279587f0463836393c9df719ce62a3e450" -"checksum getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8e190892c840661957ba9f32dacfb3eb405e657f9f9f60485605f0bb37d6f8" +"checksum getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49" "checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" @@ -3328,7 +3308,7 @@ dependencies = [ "checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e" -"checksum html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ce65ac8028cf5a287a7dbf6c4e0a6cf2dcf022ed5b167a81bae66ebf599a8b7" +"checksum html5ever 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a62c2cb2d34faa27dea3f2380ee8b06b8ff9c18e1cd5358e1da20b51089f4f1" "checksum http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "372bcb56f939e449117fb0869c2e8fd8753a8223d92a172c6e808cf123a5b6e4" "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" @@ -3337,8 +3317,9 @@ dependencies = [ "checksum hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)" = "7cb44cbce9d8ee4fb36e4c0ad7b794ac44ebaad924b9c8291a63215bb44c2c8f" "checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" "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 ignore 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5d66819194c2b95fe5549e0dd76a9ab811740cb8b57e187e6c60ccf992faf19b" -"checksum image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "99198e595d012efccf12abf4abc08da2d97be0b0355a2b08d101347527476ba4" +"checksum image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)" = "663a975007e0b49903e2e8ac0db2c432c465855f2d65f17883ba1476e85f0b42" "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" "checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" "checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718" @@ -3355,19 +3336,18 @@ dependencies = [ "checksum line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" -"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" "checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" -"checksum markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f1af46a727284117e09780d05038b1ce6fc9c76cc6df183c3dae5a8955a25e21" +"checksum markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03" "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 memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" -"checksum mime_guess 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d729cf45eaf996831fe7143af04190187ab3ee2a72ea96bd00958d1fae822a9d" +"checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" "checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" "checksum miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c061edee74a88eb35d876ce88b94d77a0448a201de111c244b70d047f5820516" "checksum miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4" @@ -3397,12 +3377,11 @@ dependencies = [ "checksum openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)" = "b5ba300217253bcc5dc68bed23d782affa45000193866e025329aa8a7a9f05b8" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" -"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" -"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "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.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" "checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" "checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646" @@ -3413,7 +3392,7 @@ dependencies = [ "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" "checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" "checksum plist 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a9f075f6394100e7c105ed1af73fb1859d6fd14e49d4290d578120beb167f" -"checksum png 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "63daf481fdd0defa2d1d2be15c674fbfa1b0fd71882c303a91f9a79b3252c359" +"checksum png 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8422b27bb2c013dd97b9aef69e161ce262236f49aaf46a0489011c8ff0264602" "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" @@ -3493,7 +3472,7 @@ dependencies = [ "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 threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" -"checksum tiff 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4834f28a0330cb9f3f2c87d2649dca723cb33802e2bdcf18da32759fbec7ce" +"checksum tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" "checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" @@ -3528,6 +3507,7 @@ dependencies = [ "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "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 utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" "checksum v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8865501b78eef9193c1b45486acf18ba889e5662eba98854d6fc59d8ecf3542d" @@ -3549,7 +3529,7 @@ dependencies = [ "checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" "checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" -"checksum ws 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ec91ea61b83ce033c43c06c52ddc7532f465c0153281610d44c58b74083aee1a" +"checksum ws 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6f5bb86663ff4d1639408410f50bf6050367a8525d644d49a6894cd618a631" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "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" diff --git a/Cargo.toml b/Cargo.toml index ef25d83..c0aecaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,12 +24,12 @@ lazy_static = "1.1.0" toml = "0.5" termcolor = "1.0.4" # Used in init to ensure the url given as base_url is a valid one -url = "1.5" +url = "2" # Below is for the serve cmd actix-files = "0.1" actix-web = { version = "1.0", default-features = false, features = [] } notify = "4" -ws = "0.8" +ws = "0.9" ctrlc = "3" open = "1.2" globset = "0.4" diff --git a/components/errors/Cargo.toml b/components/errors/Cargo.toml index 4b67b30..bfd5e9d 100644 --- a/components/errors/Cargo.toml +++ b/components/errors/Cargo.toml @@ -6,5 +6,5 @@ authors = ["Vincent Prouillet "] [dependencies] tera = "1.0.0-beta.10" toml = "0.5" -image = "0.21" +image = "0.22" syntect = "3" diff --git a/components/imageproc/Cargo.toml b/components/imageproc/Cargo.toml index 39811be..df9b4b1 100644 --- a/components/imageproc/Cargo.toml +++ b/components/imageproc/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Vojtěch Král "] lazy_static = "1" regex = "1.0" tera = "1.0.0-beta.10" -image = "0.21" +image = "0.22" rayon = "1" errors = { path = "../errors" } diff --git a/components/rebuild/src/lib.rs b/components/rebuild/src/lib.rs index f14ac5d..47523cb 100644 --- a/components/rebuild/src/lib.rs +++ b/components/rebuild/src/lib.rs @@ -394,9 +394,11 @@ pub fn after_template_change(site: &mut Site, path: &Path) -> Result<()> { _ => { // If we are updating a shortcode, re-render the markdown of all pages/site // because we have no clue which one needs rebuilding + // Same for the anchor-link template // TODO: look if there the shortcode is used in the markdown instead of re-rendering // everything - if path.components().any(|x| x == Component::Normal("shortcodes".as_ref())) { + if filename == "anchor-link.html" || path.components().any(|x| x == Component::Normal("shortcodes".as_ref())) { + println!("Rendering markdown"); site.render_markdown()?; } site.populate_sections(); diff --git a/components/search/Cargo.toml b/components/search/Cargo.toml index dbfe736..db2d9cf 100644 --- a/components/search/Cargo.toml +++ b/components/search/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Vincent Prouillet "] [dependencies] elasticlunr-rs = "2" -ammonia = "2" +ammonia = "3" lazy_static = "1" errors = { path = "../errors" } diff --git a/components/templates/Cargo.toml b/components/templates/Cargo.toml index d802b41..7e9dc87 100644 --- a/components/templates/Cargo.toml +++ b/components/templates/Cargo.toml @@ -10,10 +10,10 @@ lazy_static = "1" pulldown-cmark = "0.5" toml = "0.5" csv = "1" -image = "0.21" +image = "0.22" serde_json = "1.0" reqwest = "0.9" -url = "1.5" +url = "2" errors = { path = "../errors" } utils = { path = "../utils" } From 7f459940e16c88e1c8c920998da5142e061b032a Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sat, 10 Aug 2019 18:53:16 +0200 Subject: [PATCH 36/67] Allow multiple taxonomies with same name in different language Closes #766 --- CHANGELOG.md | 1 + Cargo.lock | 186 +++++++++++++----- components/library/src/content/file_info.rs | 10 +- components/library/src/taxonomies/mod.rs | 55 ++---- components/rebuild/src/lib.rs | 10 +- components/site/src/lib.rs | 8 +- components/site/tests/site_i18n.rs | 10 + .../getting-started/configuration.md | 1 + .../documentation/templates/taxonomies.md | 4 + src/cmd/serve.rs | 4 +- test_site_i18n/config.toml | 2 + test_site_i18n/content/blog/something.fr.md | 1 + test_site_i18n/content/blog/something.md | 1 + test_site_i18n/templates/tags/list.html | 3 + test_site_i18n/templates/tags/single.html | 21 ++ 15 files changed, 216 insertions(+), 101 deletions(-) create mode 100644 test_site_i18n/templates/tags/list.html create mode 100644 test_site_i18n/templates/tags/single.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 287f88e..d2e7a0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Add warning for old style internal links since they would still function silently - Print some counts when running `zola check` - Re-render all pages/sections when `anchor-link.html` is changed +- Taxonomies can now have the same name in multiple languages ## 0.8.0 (2019-06-22) diff --git a/Cargo.lock b/Cargo.lock index 554e04f..2cb965f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -227,7 +227,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -266,7 +266,7 @@ dependencies = [ [[package]] name = "arc-swap" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -329,6 +329,28 @@ dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "bindgen" +version = "0.50.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)", + "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)", + "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)", + "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 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)", + "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.2.1 (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" @@ -398,6 +420,14 @@ name = "cc" version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "cexpr" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "cfg-if" version = "0.1.9" @@ -415,6 +445,16 @@ dependencies = [ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "clang-sys" +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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "clap" version = "2.33.0" @@ -452,7 +492,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -614,7 +654,7 @@ dependencies = [ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -727,7 +767,19 @@ 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.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "env_logger" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.2.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.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -744,7 +796,7 @@ name = "errors" version = "0.1.0" dependencies = [ "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -765,7 +817,7 @@ 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.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -892,6 +944,14 @@ dependencies = [ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +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)", +] + [[package]] name = "generic-array" version = "0.12.3" @@ -948,7 +1008,7 @@ name = "globwalk" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ignore 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "ignore 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1001,7 +1061,7 @@ dependencies = [ "markup5ever 0.9.0 (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)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1106,7 +1166,7 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1196,7 +1256,7 @@ name = "ipconfig" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1245,6 +1305,15 @@ name = "libc" version = "0.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "libloading" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "library" version = "0.1.0" @@ -1402,7 +1471,7 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1416,7 +1485,7 @@ dependencies = [ "cc 1.0.38 (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.60 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1551,7 +1620,7 @@ 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.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1601,20 +1670,21 @@ dependencies = [ [[package]] name = "onig" -version = "4.3.2" +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)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "onig_sys 69.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "onig_sys" -version = "69.1.0" +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.38 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1715,6 +1785,11 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "percent-encoding" version = "1.0.1" @@ -1751,7 +1826,7 @@ dependencies = [ "pest_meta 2.1.1 (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)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1889,7 +1964,7 @@ dependencies = [ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1934,12 +2009,12 @@ name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand_core" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1980,7 +2055,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1992,7 +2067,7 @@ 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.60 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2003,7 +2078,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2109,7 +2184,7 @@ dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -2299,7 +2374,7 @@ 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.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2340,6 +2415,11 @@ name = "sha1" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "signal-hook" version = "0.1.10" @@ -2354,7 +2434,7 @@ name = "signal-hook-registry" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arc-swap 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "arc-swap 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2410,7 +2490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "socket2" -version = "0.3.10" +version = "0.3.11" 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)", @@ -2481,12 +2561,12 @@ dependencies = [ "heck 0.3.1 (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)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syn" -version = "0.15.42" +version = "0.15.43" 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)", @@ -2501,13 +2581,13 @@ 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.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (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.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2516,7 +2596,7 @@ dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "onig 4.3.2 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2827,7 +2907,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3025,7 +3105,7 @@ dependencies = [ "nom 4.2.3 (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)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3077,6 +3157,15 @@ dependencies = [ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +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.60 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "widestring" version = "0.4.0" @@ -3226,7 +3315,7 @@ dependencies = [ "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" "checksum ammonia 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9e266e1f4be5ffa05309f650e2586fe1d3ae6034eb24025a7ae1dfecc330823a" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum arc-swap 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1507f9b80b3ef096751728cf3f43bb0111ec906e44f5d8587e02c10643b9a2cd" +"checksum arc-swap 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "854ede29f7a0ce90519fb2439d030320c6201119b87dab0ee96044603e1130b9" "checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" "checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" @@ -3234,6 +3323,7 @@ dependencies = [ "checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" "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 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" @@ -3243,8 +3333,10 @@ dependencies = [ "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" "checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46" +"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.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" +"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 cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" @@ -3279,6 +3371,7 @@ dependencies = [ "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" "checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed" "checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d" +"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 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" @@ -3297,6 +3390,7 @@ dependencies = [ "checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" "checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" +"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 getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "72327b15c228bfe31f1390f93dd5e9279587f0463836393c9df719ce62a3e450" "checksum getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49" @@ -3318,7 +3412,7 @@ dependencies = [ "checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" "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 ignore 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5d66819194c2b95fe5549e0dd76a9ab811740cb8b57e187e6c60ccf992faf19b" +"checksum ignore 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7" "checksum image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)" = "663a975007e0b49903e2e8ac0db2c432c465855f2d65f17883ba1476e85f0b42" "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" "checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" @@ -3333,6 +3427,7 @@ dependencies = [ "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" "checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb" +"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" "checksum line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" @@ -3349,7 +3444,7 @@ dependencies = [ "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" "checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" "checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" -"checksum miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c061edee74a88eb35d876ce88b94d77a0448a201de111c244b70d047f5820516" +"checksum miniz_oxide 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fe2959c5a0747a8d7a56b4444c252ffd2dda5d452cfd147cdfdda73b1c3ece5b" "checksum miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4" "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" @@ -3368,8 +3463,8 @@ dependencies = [ "checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" "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 onig 4.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a646989adad8a19f49be2090374712931c3a59835cb5277b4530f48b417f26e7" -"checksum onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388410bf5fa341f10e58e6db3975f4bea1ac30247dd79d37a9e5ced3cb4cc3b0" +"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 open 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9d2c4abda3b735c6c456cee452c08483669408284da14f0551ce8c9e09d2e05f" "checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" @@ -3380,6 +3475,7 @@ dependencies = [ "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +"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.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" @@ -3405,7 +3501,7 @@ dependencies = [ "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" +"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" "checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" @@ -3446,6 +3542,7 @@ dependencies = [ "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" +"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" "checksum signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68" "checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" @@ -3453,7 +3550,7 @@ dependencies = [ "checksum slotmap 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4ed041f7f2ff35f2bf7d688bf30686976512f8300e37433c2c73ea9f4cf14b" "checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" -"checksum socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df028e0e632c2a1823d920ad74895e7f9128e6438cbc4bc6fd1f180e644767b9" +"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" "checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423" @@ -3462,9 +3559,9 @@ dependencies = [ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" -"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e" +"checksum syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)" = "ee06ea4b620ab59a2267c6b48be16244a3389f8bfa0986bdd15c35b890b00af3" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" -"checksum syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b" +"checksum syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fb5b18814fd5c81187d0b01b60a5b57e9577d6dc1e5e0b104443930005179e46" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" "checksum tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4892d0c45c56d7400d0e99b5c8ce08ed89dd0a2d1f8903f200c0e605123f6477" @@ -3519,6 +3616,7 @@ dependencies = [ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" +"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" diff --git a/components/library/src/content/file_info.rs b/components/library/src/content/file_info.rs index 0348a7f..32ed484 100644 --- a/components/library/src/content/file_info.rs +++ b/components/library/src/content/file_info.rs @@ -56,9 +56,8 @@ impl FileInfo { let file_path = path.to_path_buf(); let mut parent = file_path.parent().expect("Get parent of page").to_path_buf(); let name = path.file_stem().unwrap().to_string_lossy().to_string(); - let mut components = find_content_components( - &file_path.strip_prefix(base_path).unwrap_or(&file_path), - ); + let mut components = + find_content_components(&file_path.strip_prefix(base_path).unwrap_or(&file_path)); let relative = if !components.is_empty() { format!("{}/{}.md", components.join("/"), name) } else { @@ -91,9 +90,8 @@ impl FileInfo { let file_path = path.to_path_buf(); let parent = path.parent().expect("Get parent of section").to_path_buf(); let name = path.file_stem().unwrap().to_string_lossy().to_string(); - let components = find_content_components( - &file_path.strip_prefix(base_path).unwrap_or(&file_path), - ); + let components = + find_content_components(&file_path.strip_prefix(base_path).unwrap_or(&file_path)); let relative = if !components.is_empty() { format!("{}/{}.md", components.join("/"), name) } else { diff --git a/components/library/src/taxonomies/mod.rs b/components/library/src/taxonomies/mod.rs index 25392c3..5cd672e 100644 --- a/components/library/src/taxonomies/mod.rs +++ b/components/library/src/taxonomies/mod.rs @@ -142,6 +142,7 @@ impl Taxonomy { ) -> Result { let mut context = Context::new(); context.insert("config", config); + context.insert("lang", &self.kind.lang); context.insert("term", &SerializedTaxonomyItem::from_item(item, library)); context.insert("taxonomy", &self.kind); context.insert( @@ -168,6 +169,7 @@ impl Taxonomy { self.items.iter().map(|i| SerializedTaxonomyItem::from_item(i, library)).collect(); context.insert("terms", &terms); context.insert("taxonomy", &self.kind); + context.insert("lang", &self.kind.lang); context.insert("current_url", &config.make_permalink(&self.kind.name)); context.insert("current_path", &self.kind.name); @@ -186,28 +188,21 @@ pub fn find_taxonomies(config: &Config, library: &Library) -> Result Result Result<( let ignored_content_globset = site.config.ignored_content_globset.clone(); let is_ignored_file = match ignored_content_globset { Some(gs) => gs.is_match(new), - None => false + None => false, }; if !is_ignored_file { - return handle_page_editing(site, &new_path) + return handle_page_editing(site, &new_path); } - return Ok(()) + Ok(()) } /// What happens when a section or a page is created/edited @@ -397,7 +397,9 @@ pub fn after_template_change(site: &mut Site, path: &Path) -> Result<()> { // Same for the anchor-link template // TODO: look if there the shortcode is used in the markdown instead of re-rendering // everything - if filename == "anchor-link.html" || path.components().any(|x| x == Component::Normal("shortcodes".as_ref())) { + if filename == "anchor-link.html" + || path.components().any(|x| x == Component::Normal("shortcodes".as_ref())) + { println!("Rendering markdown"); site.render_markdown()?; } diff --git a/components/site/src/lib.rs b/components/site/src/lib.rs index 910f892..5ee73a9 100644 --- a/components/site/src/lib.rs +++ b/components/site/src/lib.rs @@ -210,11 +210,9 @@ impl Site { page_entries .into_par_iter() - .filter(|entry| { - match &config.ignored_content_globset { - Some(gs) => !gs.is_match(entry.as_path()), - None => true - } + .filter(|entry| match &config.ignored_content_globset { + Some(gs) => !gs.is_match(entry.as_path()), + None => true, }) .map(|entry| { let path = entry.as_path(); diff --git a/components/site/tests/site_i18n.rs b/components/site/tests/site_i18n.rs index 2f81c7c..8911a66 100644 --- a/components/site/tests/site_i18n.rs +++ b/components/site/tests/site_i18n.rs @@ -127,15 +127,25 @@ fn can_build_multilingual_site() { assert!(!file_exists!(public, "it/rss.xml")); // Taxonomies are per-language + // English assert!(file_exists!(public, "authors/index.html")); assert!(file_contains!(public, "authors/index.html", "Queen")); assert!(!file_contains!(public, "authors/index.html", "Vincent")); assert!(!file_exists!(public, "auteurs/index.html")); assert!(file_exists!(public, "authors/queen-elizabeth/rss.xml")); + assert!(file_exists!(public, "tags/index.html")); + assert!(file_contains!(public, "tags/index.html", "hello")); + assert!(!file_contains!(public, "tags/index.html", "bonjour")); + + // French assert!(!file_exists!(public, "fr/authors/index.html")); assert!(file_exists!(public, "fr/auteurs/index.html")); assert!(!file_contains!(public, "fr/auteurs/index.html", "Queen")); assert!(file_contains!(public, "fr/auteurs/index.html", "Vincent")); assert!(!file_exists!(public, "fr/auteurs/vincent-prouillet/rss.xml")); + + assert!(file_exists!(public, "fr/tags/index.html")); + assert!(file_contains!(public, "fr/tags/index.html", "bonjour")); + assert!(!file_contains!(public, "fr/tags/index.html", "hello")); } diff --git a/docs/content/documentation/getting-started/configuration.md b/docs/content/documentation/getting-started/configuration.md index 5f58a17..f580f70 100644 --- a/docs/content/documentation/getting-started/configuration.md +++ b/docs/content/documentation/getting-started/configuration.md @@ -51,6 +51,7 @@ generate_rss = false # Example: # taxonomies = [ # {name = "tags", rss = true}, # each tag will have its own RSS feed +# {name = "tags", lang = "fr"}, # you can have taxonomies with the same name in multiple languages # {name = "categories", paginate_by = 5}, # 5 items per page for a term # {name = "authors"}, # Basic definition: no RSS or pagination # ] diff --git a/docs/content/documentation/templates/taxonomies.md b/docs/content/documentation/templates/taxonomies.md index b901a3d..9b8a70f 100644 --- a/docs/content/documentation/templates/taxonomies.md +++ b/docs/content/documentation/templates/taxonomies.md @@ -43,6 +43,8 @@ current_url: String; current_path: String; // All terms for that taxonomy terms: Array; +// The lang of the current page +lang: String; ``` @@ -58,6 +60,8 @@ current_url: String; current_path: String; // The current term being rendered term: TaxonomyTerm; +// The lang of the current page +lang: String; ``` A paginated taxonomy term will also get a `paginator` variable, see the [pagination page](@/documentation/templates/pagination.md) diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs index 01d0767..c02d872 100644 --- a/src/cmd/serve.rs +++ b/src/cmd/serve.rs @@ -39,10 +39,10 @@ use ctrlc; use notify::{watcher, RecursiveMode, Watcher}; use ws::{Message, Sender, WebSocket}; +use cmd::serve::globset::GlobSet; use errors::{Error as ZolaError, Result}; use site::Site; use utils::fs::copy_file; -use cmd::serve::globset::GlobSet; use console; use open; @@ -432,7 +432,7 @@ pub fn serve( fn is_ignored_file(ignored_content_globset: &Option, path: &Path) -> bool { match ignored_content_globset { Some(gs) => gs.is_match(path), - None => false + None => false, } } diff --git a/test_site_i18n/config.toml b/test_site_i18n/config.toml index 98be3c6..47ed8f5 100644 --- a/test_site_i18n/config.toml +++ b/test_site_i18n/config.toml @@ -16,6 +16,8 @@ generate_rss = true taxonomies = [ {name = "authors", rss = true}, {name = "auteurs", lang = "fr"}, + {name = "tags"}, + {name = "tags", lang = "fr"}, ] languages = [ diff --git a/test_site_i18n/content/blog/something.fr.md b/test_site_i18n/content/blog/something.fr.md index 22579a8..2d0d890 100644 --- a/test_site_i18n/content/blog/something.fr.md +++ b/test_site_i18n/content/blog/something.fr.md @@ -4,6 +4,7 @@ date = 2018-10-09 [taxonomies] auteurs = ["Vincent Prouillet"] +tags = ["bonjour"] +++ Un article diff --git a/test_site_i18n/content/blog/something.md b/test_site_i18n/content/blog/something.md index 587edd8..1027f6f 100644 --- a/test_site_i18n/content/blog/something.md +++ b/test_site_i18n/content/blog/something.md @@ -4,6 +4,7 @@ date = 2018-10-09 [taxonomies] authors = ["Queen Elizabeth"] +tags = ["hello"] +++ A blog post diff --git a/test_site_i18n/templates/tags/list.html b/test_site_i18n/templates/tags/list.html new file mode 100644 index 0000000..734bfff --- /dev/null +++ b/test_site_i18n/templates/tags/list.html @@ -0,0 +1,3 @@ +{% for tag in terms %} + {{ tag.name }} {{ tag.slug }} {{ tag.pages | length }} {{ lang }} +{% endfor %} diff --git a/test_site_i18n/templates/tags/single.html b/test_site_i18n/templates/tags/single.html new file mode 100644 index 0000000..0c3f8fb --- /dev/null +++ b/test_site_i18n/templates/tags/single.html @@ -0,0 +1,21 @@ +{% if not paginator %} + Tag: {{ term.name }} + + {% for page in term.pages %} + + {% endfor %} +{% else %} + Tag: {{ term.name }} + {% for page in paginator.pages %} + {{page.title|safe}} + {% endfor %} + Num pagers: {{ paginator.number_pagers }} + Page size: {{ paginator.paginate_by }} + Current index: {{ paginator.current_index }} + First: {{ paginator.first | safe }} + Last: {{ paginator.last | safe }} + {% if paginator.previous %}has_prev{% endif%} + {% if paginator.next %}has_next{% endif%} +{% endif %} From c503a9fe5d7e7e4be8565aabdfa23cc856606311 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sat, 10 Aug 2019 19:09:29 +0200 Subject: [PATCH 37/67] Fix test --- components/library/src/taxonomies/mod.rs | 7 +++++-- test_site_i18n/templates/tags/list.html | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/library/src/taxonomies/mod.rs b/components/library/src/taxonomies/mod.rs index 5cd672e..0bea512 100644 --- a/components/library/src/taxonomies/mod.rs +++ b/components/library/src/taxonomies/mod.rs @@ -169,7 +169,6 @@ impl Taxonomy { self.items.iter().map(|i| SerializedTaxonomyItem::from_item(i, library)).collect(); context.insert("terms", &terms); context.insert("taxonomy", &self.kind); - context.insert("lang", &self.kind.lang); context.insert("current_url", &config.make_permalink(&self.kind.name)); context.insert("current_path", &self.kind.name); @@ -418,7 +417,11 @@ mod tests { let mut a = None; for x in taxonomies { match x.kind.name.as_ref() { - "tags" => t = Some(x), + "tags" => { + if x.kind.lang == "en" { + t = Some(x) + } + }, "categories" => c = Some(x), "auteurs" => a = Some(x), _ => unreachable!(), diff --git a/test_site_i18n/templates/tags/list.html b/test_site_i18n/templates/tags/list.html index 734bfff..18d6d50 100644 --- a/test_site_i18n/templates/tags/list.html +++ b/test_site_i18n/templates/tags/list.html @@ -1,3 +1,3 @@ {% for tag in terms %} - {{ tag.name }} {{ tag.slug }} {{ tag.pages | length }} {{ lang }} + {{ tag.name }} {{ tag.slug }} {{ tag.pages | length }} {{ taxonomy.lang }} {% endfor %} From e231818718eb2d2d5399c7d410487e0b06307abd Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sat, 10 Aug 2019 19:21:53 +0200 Subject: [PATCH 38/67] Add back subsections in basic section ser Closes #733 --- components/library/src/content/ser.rs | 26 +++++++++++------------- components/library/src/taxonomies/mod.rs | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/components/library/src/content/ser.rs b/components/library/src/content/ser.rs index f530484..f28ccc0 100644 --- a/components/library/src/content/ser.rs +++ b/components/library/src/content/ser.rs @@ -254,23 +254,21 @@ impl<'a> SerializingSection<'a> { } } - /// Same as from_section but doesn't fetch pages and sections + /// Same as from_section but doesn't fetch pages pub fn from_section_basic(section: &'a Section, library: Option<&'a Library>) -> Self { - let ancestors = if let Some(ref lib) = library { - section + let mut ancestors = vec![]; + let mut translations = vec![]; + let mut subsections = vec![]; + if let Some(ref lib) = library { + ancestors = section .ancestors .iter() .map(|k| lib.get_section_by_key(*k).file.relative.clone()) - .collect() - } else { - vec![] - }; - - let translations = if let Some(ref lib) = library { - TranslatedContent::find_all_sections(section, lib) - } else { - vec![] - }; + .collect(); + translations = TranslatedContent::find_all_sections(section, lib); + subsections = + section.subsections.iter().map(|k| lib.get_section_path_by_key(*k)).collect(); + } SerializingSection { relative_path: §ion.file.relative, @@ -287,7 +285,7 @@ impl<'a> SerializingSection<'a> { assets: §ion.serialized_assets, lang: §ion.lang, pages: vec![], - subsections: vec![], + subsections, translations, } } diff --git a/components/library/src/taxonomies/mod.rs b/components/library/src/taxonomies/mod.rs index 0bea512..7486ce8 100644 --- a/components/library/src/taxonomies/mod.rs +++ b/components/library/src/taxonomies/mod.rs @@ -421,7 +421,7 @@ mod tests { if x.kind.lang == "en" { t = Some(x) } - }, + } "categories" => c = Some(x), "auteurs" => a = Some(x), _ => unreachable!(), From be0687ba6ed980f5bcffe94ebad07279790ae07e Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Mon, 12 Aug 2019 18:57:36 +0200 Subject: [PATCH 39/67] cargo update --- Cargo.lock | 155 ++++++++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2cb965f..802e73a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,7 +46,7 @@ dependencies = [ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "v_htmlescape 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -227,7 +227,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -282,7 +282,7 @@ name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -298,7 +298,7 @@ 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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -308,7 +308,7 @@ version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -377,7 +377,7 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -438,7 +438,7 @@ name = "chrono" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (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)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -451,7 +451,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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -534,7 +534,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -611,7 +611,7 @@ name = "csv" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "bstr 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "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)", @@ -654,7 +654,7 @@ dependencies = [ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -767,7 +767,7 @@ 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.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -817,7 +817,7 @@ 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.43 (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)", ] @@ -832,7 +832,7 @@ version = "0.2.5" 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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -842,7 +842,7 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (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_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -899,7 +899,7 @@ name = "fsevent-sys" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -974,7 +974,7 @@ version = "0.1.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)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -997,7 +997,7 @@ version = "0.4.4" 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)", - "bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "bstr 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1047,7 +1047,7 @@ name = "hostname" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1061,7 +1061,7 @@ dependencies = [ "markup5ever 0.9.0 (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)", - "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1231,7 +1231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1239,7 +1239,7 @@ name = "inotify-sys" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1247,7 +1247,7 @@ name = "iovec" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1302,7 +1302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.60" +version = "0.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1432,7 +1432,7 @@ name = "memchr" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1466,12 +1466,12 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "miniz_oxide" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1484,8 +1484,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.38 (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.60 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1497,7 +1497,7 @@ dependencies = [ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1522,7 +1522,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1543,7 +1543,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1560,7 +1560,7 @@ version = "0.2.33" 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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1577,7 +1577,7 @@ dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.38 (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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1606,7 +1606,7 @@ dependencies = [ "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1620,7 +1620,7 @@ 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.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1665,7 +1665,7 @@ name = "num_cpus" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1675,7 +1675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "onig_sys 69.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1696,7 +1696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "open" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1711,7 +1711,7 @@ dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1727,7 +1727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (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)", ] @@ -1764,7 +1764,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1778,7 +1778,7 @@ 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)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1826,7 +1826,7 @@ dependencies = [ "pest_meta 2.1.1 (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)", - "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1962,7 +1962,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1980,7 +1980,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2054,7 +2054,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2066,7 +2066,7 @@ 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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2277,7 +2277,7 @@ name = "sass-rs" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2287,7 +2287,7 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2334,7 +2334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2374,7 +2374,7 @@ 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.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2425,7 +2425,7 @@ name = "signal-hook" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2435,7 +2435,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arc-swap 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2494,7 +2494,7 @@ version = "0.3.11" 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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2561,12 +2561,12 @@ dependencies = [ "heck 0.3.1 (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)", - "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syn" -version = "0.15.43" +version = "0.15.44" 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)", @@ -2581,7 +2581,7 @@ 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.43 (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)", ] @@ -2612,7 +2612,7 @@ version = "3.1.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)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2717,7 +2717,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2812,7 +2812,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3090,31 +3090,30 @@ dependencies = [ [[package]] name = "v_escape" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "v_escape_derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "v_escape_derive 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "v_escape_derive" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "nom 4.2.3 (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)", - "syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "v_htmlescape" -version = "0.4.3" +version = "0.4.5" 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)", - "v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "v_escape 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3163,7 +3162,7 @@ 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.60 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3287,7 +3286,7 @@ dependencies = [ "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)", - "open 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rebuild 0.1.0", "site 0.1.0", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3327,7 +3326,7 @@ dependencies = [ "checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" "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 bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e0a692f1c740e7e821ca71a22cf99b9b2322dfa94d10f71443befb1797b3946a" +"checksum bstr 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94cdf78eb7e94c566c1f5dbe2abf8fc70a548fc902942a48c4b3a98b48ca9ade" "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 bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" @@ -3426,7 +3425,7 @@ dependencies = [ "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -"checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb" +"checksum libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)" = "c665266eb592905e8503ba3403020f4b8794d26263f412ca33171600eca9a6fa" "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" "checksum line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" @@ -3444,7 +3443,7 @@ dependencies = [ "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" "checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" "checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" -"checksum miniz_oxide 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fe2959c5a0747a8d7a56b4444c252ffd2dda5d452cfd147cdfdda73b1c3ece5b" +"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10" "checksum miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4" "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" @@ -3466,7 +3465,7 @@ dependencies = [ "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 open 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9d2c4abda3b735c6c456cee452c08483669408284da14f0551ce8c9e09d2e05f" +"checksum open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "94b424e1086328b0df10235c6ff47be63708071881bead9e76997d9291c0134b" "checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" "checksum openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)" = "b5ba300217253bcc5dc68bed23d782affa45000193866e025329aa8a7a9f05b8" @@ -3559,7 +3558,7 @@ dependencies = [ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" -"checksum syn 0.15.43 (registry+https://github.com/rust-lang/crates.io-index)" = "ee06ea4b620ab59a2267c6b48be16244a3389f8bfa0986bdd15c35b890b00af3" +"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fb5b18814fd5c81187d0b01b60a5b57e9577d6dc1e5e0b104443930005179e46" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" @@ -3607,9 +3606,9 @@ dependencies = [ "checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" "checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -"checksum v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8865501b78eef9193c1b45486acf18ba889e5662eba98854d6fc59d8ecf3542d" -"checksum v_escape_derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "306896ff4b75998501263a1dc000456de442e21d68fe8c8bdf75c66a33a58e23" -"checksum v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7fbbe0fa88dd36f9c8cf61a218d4b953ba669de4d0785832f33cc72bd081e1be" +"checksum v_escape 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "660b101c07b5d0863deb9e7fb3138777e858d6d2a79f9e6049a27d1cc77c6da6" +"checksum v_escape_derive 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "75b2dc50d1c14d7b4488bf34263140a3827d8ca4f4265411e4784ac262382276" +"checksum v_htmlescape 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e33e939c0d8cf047514fb6ba7d5aac78bc56677a6938b2ee67000b91f2e97e41" "checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" "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" From 0238e34047899b99cdb16efaae6a04b9723ab4e8 Mon Sep 17 00:00:00 2001 From: Katsutoshi Horie Date: Tue, 13 Aug 2019 01:59:04 +0900 Subject: [PATCH 40/67] Add trailing slash to multilingual section path (#772) --- components/library/src/content/section.rs | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/components/library/src/content/section.rs b/components/library/src/content/section.rs index 534d158..bbcedfa 100644 --- a/components/library/src/content/section.rs +++ b/components/library/src/content/section.rs @@ -113,7 +113,11 @@ impl Section { section.reading_time = Some(reading_time); let path = section.file.components.join("/"); if section.lang != config.default_language { - section.path = format!("{}/{}", section.lang, path); + if path.is_empty() { + section.path = format!("{}/", section.lang); + } else { + section.path = format!("{}/{}/", section.lang, path); + } } else { section.path = format!("{}/", path); } @@ -381,4 +385,21 @@ Bonjour le monde"# assert_eq!(section.lang, "fr".to_string()); assert_eq!(section.permalink, "http://a-website.com/fr/"); } + + #[test] + fn can_make_links_to_translated_subsections_with_trailing_slash() { + let mut config = Config::default(); + config.languages.push(Language { code: String::from("fr"), rss: false }); + let content = r#" ++++ ++++ +Bonjour le monde"# + .to_string(); + let res = + Section::parse(Path::new("content/subcontent/_index.fr.md"), &content, &config, &PathBuf::new()); + assert!(res.is_ok()); + let section = res.unwrap(); + assert_eq!(section.lang, "fr".to_string()); + assert_eq!(section.permalink, "http://a-website.com/fr/subcontent/"); + } } From a6db79f89bd1fa9f2b325ff2f2057400bf4ef8ab Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Mon, 12 Aug 2019 22:47:46 +0200 Subject: [PATCH 41/67] Use fixed version for syntect >3.2.0 has an updated onig version which requires llvm which isn't built in azure pipelines in Windows --- Cargo.lock | 120 +++----------------------------- components/config/Cargo.toml | 2 +- components/errors/Cargo.toml | 2 +- components/rendering/Cargo.toml | 2 +- 4 files changed, 14 insertions(+), 112 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 802e73a..d6c6334 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -329,28 +329,6 @@ dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bindgen" -version = "0.50.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)", - "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)", - "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)", - "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 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)", - "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.2.1 (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" @@ -420,14 +398,6 @@ name = "cc" version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "cexpr" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "cfg-if" version = "0.1.9" @@ -445,16 +415,6 @@ dependencies = [ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "clang-sys" -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.61 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "clap" version = "2.33.0" @@ -492,7 +452,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -770,18 +730,6 @@ dependencies = [ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "env_logger" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.2.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.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "error-chain" version = "0.12.1" @@ -796,7 +744,7 @@ name = "errors" version = "0.1.0" dependencies = [ "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -944,14 +892,6 @@ dependencies = [ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -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)", -] - [[package]] name = "generic-array" version = "0.12.3" @@ -1305,15 +1245,6 @@ name = "libc" version = "0.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "library" version = "0.1.0" @@ -1670,21 +1601,20 @@ dependencies = [ [[package]] name = "onig" -version = "5.0.0" +version = "4.3.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)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", - "onig_sys 69.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "onig_sys" -version = "69.2.0" +version = "69.1.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.38 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1785,11 +1715,6 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "percent-encoding" version = "1.0.1" @@ -2184,7 +2109,7 @@ dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -2415,11 +2340,6 @@ name = "sha1" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "signal-hook" version = "0.1.10" @@ -2587,7 +2507,7 @@ dependencies = [ [[package]] name = "syntect" -version = "3.2.1" +version = "3.2.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)", @@ -2596,7 +2516,7 @@ dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.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)", + "onig 4.3.3 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3156,15 +3076,6 @@ dependencies = [ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -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.61 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "widestring" version = "0.4.0" @@ -3322,7 +3233,6 @@ dependencies = [ "checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" "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 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" @@ -3332,10 +3242,8 @@ dependencies = [ "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" "checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46" -"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.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" -"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 cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" @@ -3370,7 +3278,6 @@ dependencies = [ "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" "checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed" "checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d" -"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 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" @@ -3389,7 +3296,6 @@ dependencies = [ "checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" "checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -"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 getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "72327b15c228bfe31f1390f93dd5e9279587f0463836393c9df719ce62a3e450" "checksum getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49" @@ -3426,7 +3332,6 @@ dependencies = [ "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" "checksum libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)" = "c665266eb592905e8503ba3403020f4b8794d26263f412ca33171600eca9a6fa" -"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" "checksum line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" @@ -3462,8 +3367,8 @@ dependencies = [ "checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" "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 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 onig 4.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8518fcb2b1b8c2f45f0ad499df4fda6087fc3475ca69a185c173b8315d2fb383" +"checksum onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388410bf5fa341f10e58e6db3975f4bea1ac30247dd79d37a9e5ced3cb4cc3b0" "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" "checksum open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "94b424e1086328b0df10235c6ff47be63708071881bead9e76997d9291c0134b" "checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" @@ -3474,7 +3379,6 @@ dependencies = [ "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -"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.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" @@ -3541,7 +3445,6 @@ dependencies = [ "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" -"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" "checksum signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68" "checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" @@ -3560,7 +3463,7 @@ dependencies = [ "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" -"checksum syntect 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fb5b18814fd5c81187d0b01b60a5b57e9577d6dc1e5e0b104443930005179e46" +"checksum syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" "checksum tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4892d0c45c56d7400d0e99b5c8ce08ed89dd0a2d1f8903f200c0e605123f6477" @@ -3615,7 +3518,6 @@ dependencies = [ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml index f377970..643f3d1 100644 --- a/components/config/Cargo.toml +++ b/components/config/Cargo.toml @@ -10,7 +10,7 @@ serde_derive = "1" chrono = "0.4" globset = "0.4" lazy_static = "1" -syntect = "3" +syntect = "=3.2.0" errors = { path = "../errors" } utils = { path = "../utils" } diff --git a/components/errors/Cargo.toml b/components/errors/Cargo.toml index bfd5e9d..21d957d 100644 --- a/components/errors/Cargo.toml +++ b/components/errors/Cargo.toml @@ -7,4 +7,4 @@ authors = ["Vincent Prouillet "] tera = "1.0.0-beta.10" toml = "0.5" image = "0.22" -syntect = "3" +syntect = "=3.2.0" diff --git a/components/rendering/Cargo.toml b/components/rendering/Cargo.toml index 121a363..82ec273 100644 --- a/components/rendering/Cargo.toml +++ b/components/rendering/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Vincent Prouillet "] [dependencies] tera = { version = "1.0.0-beta.10", features = ["preserve_order"] } -syntect = "3" +syntect = "=3.2.0" pulldown-cmark = "0.5" slug = "0.1" serde = "1" From fd19469e403d140a894dcfee9a0874e1d60b41d5 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Tue, 13 Aug 2019 19:19:43 +0200 Subject: [PATCH 42/67] Clarify a bit the pager term Closes #775 --- .../documentation/templates/pagination.md | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/content/documentation/templates/pagination.md b/docs/content/documentation/templates/pagination.md index aaa6d6f..e50d92b 100644 --- a/docs/content/documentation/templates/pagination.md +++ b/docs/content/documentation/templates/pagination.md @@ -11,27 +11,30 @@ while both a paginated taxonomy page and a paginated section page gets a `paginator` variable of the `Pager` type: ```ts -// How many items per page +// How many items per pager paginate_by: Number; // The base URL for the pagination: section permalink + pagination path -// You can concatenate an integer with that to get a link to a given pagination page. +// You can concatenate an integer with that to get a link to a given pagination pager. base_url: String; -// How many pagers in this paginator +// How many pagers in total number_pagers: Number; -// Permalink to the first page +// Permalink to the first pager first: String; -// Permalink to the last page +// Permalink to the last pager last: String; -// Permalink to the previous page, if there is one +// Permalink to the previous pager, if there is one previous: String?; -// Permalink to the next page, if there is one +// Permalink to the next pager, if there is one next: String?; -// All pages for the current page +// All pages for the current pager pages: Array; -// Which page are we on +// Which pager are we on current_index: Number; ``` +A pager is a page of the pagination: if you have 100 pages and are paginating 10 by 10, you will have 10 pagers containing +each 10 pages. + ## Section A paginated section gets the same `section` variable as a normal From 13b395b5369479e11c7fe03668f1e7f178f5c9d5 Mon Sep 17 00:00:00 2001 From: southerntofu <52931252+southerntofu@users.noreply.github.com> Date: Tue, 13 Aug 2019 17:56:57 +0000 Subject: [PATCH 43/67] zola init works inside existing directories (closes #406) (#777) * zola init works without argument (defaults to current directory) * zola init works with existing folders (no non-hidden files permitted) * Update zola init documentation * [docs] Optional argument is on a separate line for clarity * Add tests for init subcommand's respect of existing folders --- .../getting-started/cli-usage.md | 11 ++- src/cli.rs | 2 +- src/cmd/init.rs | 89 ++++++++++++++++++- 3 files changed, 95 insertions(+), 7 deletions(-) diff --git a/docs/content/documentation/getting-started/cli-usage.md b/docs/content/documentation/getting-started/cli-usage.md index a91daa1..16a64bc 100644 --- a/docs/content/documentation/getting-started/cli-usage.md +++ b/docs/content/documentation/getting-started/cli-usage.md @@ -14,10 +14,17 @@ Creates the directory structure used by Zola at the given directory. ```bash $ zola init my_site +$ zola init ``` -will create a new folder named `my_site` and the files/folders needed by -zola. +If the `my_site` folder already exists, Zola will only populate it if it does not contain non-hidden files (dotfiles are ignored). If no `my_site` argument is passed, Zola will try to populate the current directory. + +You can initialize a git repository and a Zola site directly from within a new folder: + +```bash +$ git init +$ zola init +``` ## build diff --git a/src/cli.rs b/src/cli.rs index c47710c..8951840 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -19,7 +19,7 @@ pub fn build_cli() -> App<'static, 'static> { .about("Create a new Zola project") .arg( Arg::with_name("name") - .required(true) + .default_value(".") .help("Name of the project. Will create a new directory with that name in the current directory") ), SubCommand::with_name("build") diff --git a/src/cmd/init.rs b/src/cmd/init.rs index b263482..a243c1a 100644 --- a/src/cmd/init.rs +++ b/src/cmd/init.rs @@ -25,14 +25,41 @@ build_search_index = %SEARCH% # Put all your custom variables here "#; +// Given a path, return true if it is a directory and it doesn't have any +// non-hidden files, otherwise return false (path is assumed to exist) +pub fn is_directory_quasi_empty(path: &Path) -> Result { + if path.is_dir() { + let mut entries = match path.read_dir() { + Ok(entries) => entries, + Err(e) => { bail!("Could not read `{}` because of error: {}", path.to_string_lossy().to_string(), e); } + }; + // If any entry raises an error or isn't hidden (i.e. starts with `.`), we raise an error + if entries.any(|x| match x { + Ok(file) => !file.file_name().to_str().expect("Could not convert filename to &str").starts_with("."), + Err(_) => true + }) { + return Ok(false) + } + return Ok(true) + } else { + return Ok(false) + } +} + pub fn create_new_project(name: &str) -> Result<()> { let path = Path::new(name); // Better error message than the rust default - if path.exists() && path.is_dir() { - bail!("Folder `{}` already exists", path.to_string_lossy().to_string()); + if path.exists() { + if !is_directory_quasi_empty(&path)? { + if name == "." { + bail!("The current directory is not an empty folder (hidden files are ignored)."); + } else { + bail!("`{}` is not an empty folder (hidden files are ignored).", path.to_string_lossy().to_string()) + } + } + } else { + create_dir(path)?; } - - create_dir(path)?; console::info("Welcome to Zola!"); let base_url = ask_url("> What is the URL of your site?", "https://example.com")?; @@ -66,3 +93,57 @@ pub fn create_new_project(name: &str) -> Result<()> { println!("Visit https://www.getzola.org for the full documentation."); Ok(()) } + +#[cfg(test)] +mod tests { + use std::env::temp_dir; + use std::fs::{create_dir,remove_dir,remove_dir_all}; + use super::*; + + #[test] + fn init_empty_directory() { + let mut dir = temp_dir(); + dir.push("test_empty_dir"); + if dir.exists() { + remove_dir_all(&dir).expect("Could not free test directory"); + } + create_dir(&dir).expect("Could not create test directory"); + let allowed = is_directory_quasi_empty(&dir).expect("An error happened reading the directory's contents"); + remove_dir(&dir).unwrap(); + assert_eq!(true, allowed); + } + + #[test] + fn init_non_empty_directory() { + let mut dir = temp_dir(); + dir.push("test_non_empty_dir"); + if dir.exists() { + remove_dir_all(&dir).expect("Could not free test directory"); + } + create_dir(&dir).expect("Could not create test directory"); + let mut content = dir.clone(); + content.push("content"); + create_dir(&content).unwrap(); + let allowed = is_directory_quasi_empty(&dir).expect("An error happened reading the directory's contents"); + remove_dir(&content).unwrap(); + remove_dir(&dir).unwrap(); + assert_eq!(false, allowed); + } + + #[test] + fn init_quasi_empty_directory() { + let mut dir = temp_dir(); + dir.push("test_quasi_empty_dir"); + if dir.exists() { + remove_dir_all(&dir).expect("Could not free test directory"); + } + create_dir(&dir).expect("Could not create test directory"); + let mut git = dir.clone(); + git.push(".git"); + create_dir(&git).unwrap(); + let allowed = is_directory_quasi_empty(&dir).expect("An error happened reading the directory's contents"); + remove_dir(&git).unwrap(); + remove_dir(&dir).unwrap(); + assert_eq!(true, allowed); + } +} From 8942c1542862d9482996fe95ca38807ae5f0611e Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Tue, 13 Aug 2019 20:01:17 +0200 Subject: [PATCH 44/67] Add to changelog + rustfmt --- CHANGELOG.md | 1 + components/library/src/content/section.rs | 8 +++-- src/cmd/init.rs | 42 ++++++++++++++++------- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2e7a0d..f227adf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Print some counts when running `zola check` - Re-render all pages/sections when `anchor-link.html` is changed - Taxonomies can now have the same name in multiple languages +- `zola init` can now be create sites inside the current directory ## 0.8.0 (2019-06-22) diff --git a/components/library/src/content/section.rs b/components/library/src/content/section.rs index bbcedfa..21b700a 100644 --- a/components/library/src/content/section.rs +++ b/components/library/src/content/section.rs @@ -395,8 +395,12 @@ Bonjour le monde"# +++ Bonjour le monde"# .to_string(); - let res = - Section::parse(Path::new("content/subcontent/_index.fr.md"), &content, &config, &PathBuf::new()); + let res = Section::parse( + Path::new("content/subcontent/_index.fr.md"), + &content, + &config, + &PathBuf::new(), + ); assert!(res.is_ok()); let section = res.unwrap(); assert_eq!(section.lang, "fr".to_string()); diff --git a/src/cmd/init.rs b/src/cmd/init.rs index a243c1a..f032491 100644 --- a/src/cmd/init.rs +++ b/src/cmd/init.rs @@ -31,19 +31,29 @@ pub fn is_directory_quasi_empty(path: &Path) -> Result { if path.is_dir() { let mut entries = match path.read_dir() { Ok(entries) => entries, - Err(e) => { bail!("Could not read `{}` because of error: {}", path.to_string_lossy().to_string(), e); } + Err(e) => { + bail!( + "Could not read `{}` because of error: {}", + path.to_string_lossy().to_string(), + e + ); + } }; // If any entry raises an error or isn't hidden (i.e. starts with `.`), we raise an error if entries.any(|x| match x { - Ok(file) => !file.file_name().to_str().expect("Could not convert filename to &str").starts_with("."), - Err(_) => true + Ok(file) => !file + .file_name() + .to_str() + .expect("Could not convert filename to &str") + .starts_with('.'), + Err(_) => true, }) { - return Ok(false) + return Ok(false); } - return Ok(true) - } else { - return Ok(false) + return Ok(true); } + + Ok(false) } pub fn create_new_project(name: &str) -> Result<()> { @@ -54,7 +64,10 @@ pub fn create_new_project(name: &str) -> Result<()> { if name == "." { bail!("The current directory is not an empty folder (hidden files are ignored)."); } else { - bail!("`{}` is not an empty folder (hidden files are ignored).", path.to_string_lossy().to_string()) + bail!( + "`{}` is not an empty folder (hidden files are ignored).", + path.to_string_lossy().to_string() + ) } } } else { @@ -96,9 +109,9 @@ pub fn create_new_project(name: &str) -> Result<()> { #[cfg(test)] mod tests { - use std::env::temp_dir; - use std::fs::{create_dir,remove_dir,remove_dir_all}; use super::*; + use std::env::temp_dir; + use std::fs::{create_dir, remove_dir, remove_dir_all}; #[test] fn init_empty_directory() { @@ -108,7 +121,8 @@ mod tests { remove_dir_all(&dir).expect("Could not free test directory"); } create_dir(&dir).expect("Could not create test directory"); - let allowed = is_directory_quasi_empty(&dir).expect("An error happened reading the directory's contents"); + let allowed = is_directory_quasi_empty(&dir) + .expect("An error happened reading the directory's contents"); remove_dir(&dir).unwrap(); assert_eq!(true, allowed); } @@ -124,7 +138,8 @@ mod tests { let mut content = dir.clone(); content.push("content"); create_dir(&content).unwrap(); - let allowed = is_directory_quasi_empty(&dir).expect("An error happened reading the directory's contents"); + let allowed = is_directory_quasi_empty(&dir) + .expect("An error happened reading the directory's contents"); remove_dir(&content).unwrap(); remove_dir(&dir).unwrap(); assert_eq!(false, allowed); @@ -141,7 +156,8 @@ mod tests { let mut git = dir.clone(); git.push(".git"); create_dir(&git).unwrap(); - let allowed = is_directory_quasi_empty(&dir).expect("An error happened reading the directory's contents"); + let allowed = is_directory_quasi_empty(&dir) + .expect("An error happened reading the directory's contents"); remove_dir(&git).unwrap(); remove_dir(&dir).unwrap(); assert_eq!(true, allowed); From f0c48b8a14850bbe5d9bbda1695ca8982cecdff1 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Tue, 13 Aug 2019 20:15:56 +0200 Subject: [PATCH 45/67] Add some more text to zola init Closes #773 --- docs/content/documentation/getting-started/cli-usage.md | 5 +++-- src/cmd/init.rs | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/content/documentation/getting-started/cli-usage.md b/docs/content/documentation/getting-started/cli-usage.md index 16a64bc..c63c9ba 100644 --- a/docs/content/documentation/getting-started/cli-usage.md +++ b/docs/content/documentation/getting-started/cli-usage.md @@ -3,14 +3,15 @@ title = "CLI usage" weight = 2 +++ -Zola only has 3 commands: init, build and serve. +Zola only has 4 commands: `init`, `build`, `serve` and `check`. You can view the help of the whole program by running `zola --help` and the command help by running `zola --help`. ## init -Creates the directory structure used by Zola at the given directory. +Creates the directory structure used by Zola at the given directory after asking a few basic configuration questions. +Any choices made during those prompts can easily be changed by modifying the `config.toml`. ```bash $ zola init my_site diff --git a/src/cmd/init.rs b/src/cmd/init.rs index f032491..88233ff 100644 --- a/src/cmd/init.rs +++ b/src/cmd/init.rs @@ -70,10 +70,11 @@ pub fn create_new_project(name: &str) -> Result<()> { ) } } - } else { - create_dir(path)?; } + console::info("Welcome to Zola!"); + console::info("Please answer a few questions to get started quickly."); + console::info("Any choices made can be changed by modifying the `config.toml` file later."); let base_url = ask_url("> What is the URL of your site?", "https://example.com")?; let compile_sass = ask_bool("> Do you want to enable Sass compilation?", true)?; @@ -87,6 +88,7 @@ pub fn create_new_project(name: &str) -> Result<()> { .replace("%SEARCH%", &format!("{}", search)) .replace("%HIGHLIGHT%", &format!("{}", highlight)); + create_dir(path)?; create_file(&path.join("config.toml"), &config)?; create_dir(path.join("content"))?; From 36f4ad9a4b9ae7c2e77dc8016232e8d3a5c02d95 Mon Sep 17 00:00:00 2001 From: Joseph Price Date: Wed, 14 Aug 2019 10:06:41 +0100 Subject: [PATCH 46/67] Missing argument in resize_image docs (#778) --- docs/content/documentation/content/image-processing/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/documentation/content/image-processing/index.md b/docs/content/documentation/content/image-processing/index.md index 30aa0e7..8dbb281 100644 --- a/docs/content/documentation/content/image-processing/index.md +++ b/docs/content/documentation/content/image-processing/index.md @@ -9,7 +9,7 @@ which is available in template code as well as in shortcodes. The function usage is as follows: ```jinja2 -resize_image(path, width, height, op, quality) +resize_image(path, width, height, op, format, quality) ``` ### Arguments @@ -150,4 +150,4 @@ Here is the result: ## Get image size Sometimes when building a gallery it is useful to know the dimensions of each asset. You can get this information with -[get_image_metadata](@/documentation/templates/overview.md#get-image-metadata) \ No newline at end of file +[get_image_metadata](@/documentation/templates/overview.md#get-image-metadata) From 4695b029a0b578238696bcfdd3af68eda8f8147f Mon Sep 17 00:00:00 2001 From: southerntofu <52931252+southerntofu@users.noreply.github.com> Date: Thu, 15 Aug 2019 08:19:32 +0000 Subject: [PATCH 47/67] Fix ToC generation for heading levels > 3 (bugfix) (#774) * Fix ToC generation for heading levels > 3 * typo * Add tests for deep ToCs * Code style change --- components/rendering/src/table_of_contents.rs | 100 +++++++++++++++--- 1 file changed, 84 insertions(+), 16 deletions(-) diff --git a/components/rendering/src/table_of_contents.rs b/components/rendering/src/table_of_contents.rs index 377b94d..4b60b97 100644 --- a/components/rendering/src/table_of_contents.rs +++ b/components/rendering/src/table_of_contents.rs @@ -27,33 +27,58 @@ impl Default for Header { } } +// Takes a potential (mutable) parent and a header to try and insert into +// Returns true when it performed the insertion, false otherwise +fn insert_into_parent(potential_parent: Option<&mut Header>, header: &Header) -> bool { + match potential_parent { + None => { + // No potential parent to insert into so it needs to be insert higher + return false; + }, + Some(parent) => { + let diff = header.level - parent.level; + if diff <= 0 { + // Heading is same level or higher so we don't insert here + return false; + } + if diff == 1 { + // We have a direct child of the parent + parent.children.push(header.clone()); + return true; + } + // We need to go deeper + if !insert_into_parent(parent.children.iter_mut().last(), header) { + // No, we need to insert it here + parent.children.push(header.clone()); + } + return true; + } + } +} + /// Converts the flat temp headers into a nested set of headers /// representing the hierarchy pub fn make_table_of_contents(headers: Vec
) -> Vec
{ let mut toc = vec![]; - 'parent: for header in headers { + for header in headers { if toc.is_empty() { + // First header, nothing to compare it with toc.push(header); continue; } - // See if we have to insert as a child of a previous header - for h in toc.iter_mut().rev() { - // Look in its children first - for child in h.children.iter_mut().rev() { - if header.level > child.level { - child.children.push(header); - continue 'parent; - } - } - if header.level > h.level { - h.children.push(header); - continue 'parent; + // We try to insert the current header in a previous one + match insert_into_parent(toc.iter_mut().last(), &header) { + true => { + // Header was successfully inserted as a child of a previous element + continue; + }, + false => { + // Couldn't insert in a previous header, so it's a top-level header + toc.push(header); + continue; } } - - // Nop, just insert it - toc.push(header) } toc @@ -91,6 +116,49 @@ mod tests { assert_eq!(toc[1].children[0].children.len(), 2); } + #[test] + fn can_make_deep_toc() { + let input = vec![ + Header::new(1), + Header::new(2), + Header::new(3), + Header::new(4), + Header::new(5), + Header::new(4), + ]; + let toc = make_table_of_contents(input); + assert_eq!(toc.len(), 1); + assert_eq!(toc[0].children.len(), 1); + assert_eq!(toc[0].children[0].children.len(), 1); + assert_eq!(toc[0].children[0].children[0].children.len(), 2); + assert_eq!(toc[0].children[0].children[0].children[0].children.len(), 1); + } + + #[test] + fn can_make_deep_messy_toc() { + let input = vec![ + Header::new(2), // toc[0] + Header::new(3), + Header::new(4), + Header::new(5), + Header::new(4), + Header::new(2), // toc[1] + Header::new(1), // toc[2] + Header::new(2), + Header::new(3), + Header::new(4), + ]; + let toc = make_table_of_contents(input); + assert_eq!(toc.len(), 3); + assert_eq!(toc[0].children.len(), 1); + assert_eq!(toc[0].children[0].children.len(), 2); + assert_eq!(toc[0].children[0].children[0].children.len(), 1); + assert_eq!(toc[1].children.len(), 0); + assert_eq!(toc[2].children.len(), 1); + assert_eq!(toc[2].children[0].children.len(), 1); + assert_eq!(toc[2].children[0].children[0].children.len(), 1); + } + #[test] fn can_make_messy_toc() { let input = vec![ From 6d5611f409757e3c81b75b4b2ba37bf0de5fb549 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Thu, 15 Aug 2019 20:33:13 +0200 Subject: [PATCH 48/67] Use new Tera escape_xml filter for xml files --- CHANGELOG.md | 1 + Cargo.lock | 206 +++++++++--------- components/templates/src/builtins/rss.xml | 6 +- components/templates/src/builtins/sitemap.xml | 2 +- 4 files changed, 111 insertions(+), 104 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f227adf..cbcddba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Re-render all pages/sections when `anchor-link.html` is changed - Taxonomies can now have the same name in multiple languages - `zola init` can now be create sites inside the current directory +- Fix table of contents generation for deep heading levels ## 0.8.0 (2019-06-22) diff --git a/Cargo.lock b/Cargo.lock index d6c6334..959b5e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,7 +35,7 @@ name = "actix-files" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-http 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "actix-http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -62,7 +62,6 @@ dependencies = [ "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -79,12 +78,12 @@ dependencies = [ "lazy_static 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)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -195,7 +194,7 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-http 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -282,7 +281,7 @@ name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -298,8 +297,8 @@ 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.61 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -307,8 +306,8 @@ name = "backtrace-sys" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -395,7 +394,7 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -408,7 +407,7 @@ name = "chrono" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -453,7 +452,7 @@ dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -494,7 +493,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -745,8 +744,8 @@ version = "0.1.0" dependencies = [ "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -780,19 +779,19 @@ version = "0.2.5" 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.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "flate2" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (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_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -823,8 +822,8 @@ dependencies = [ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -847,7 +846,7 @@ name = "fsevent-sys" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -910,11 +909,12 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.8" +version = "0.1.9" 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.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -987,7 +987,7 @@ name = "hostname" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1147,7 +1147,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -1171,7 +1171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1179,7 +1179,7 @@ name = "inotify-sys" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1187,7 +1187,7 @@ name = "iovec" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1242,7 +1242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.61" +version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1263,8 +1263,8 @@ dependencies = [ "slotmap 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -1363,7 +1363,7 @@ name = "memchr" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1396,8 +1396,8 @@ name = "miniz-sys" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1408,17 +1408,6 @@ dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "miniz_oxide_c_api" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.38 (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.61 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mio" version = "0.6.19" @@ -1428,7 +1417,7 @@ dependencies = [ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (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)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1453,7 +1442,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1474,7 +1463,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (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)", "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1491,7 +1480,7 @@ version = "0.2.33" 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.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1506,9 +1495,9 @@ version = "0.14.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)", - "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.40 (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.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1537,7 +1526,7 @@ dependencies = [ "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1596,7 +1585,7 @@ name = "num_cpus" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1606,7 +1595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1615,7 +1604,7 @@ name = "onig_sys" version = "69.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1641,7 +1630,7 @@ dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1656,8 +1645,8 @@ version = "0.9.48" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.40 (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)", ] @@ -1694,7 +1683,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1708,7 +1697,7 @@ 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)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1887,7 +1876,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1904,8 +1893,8 @@ name = "rand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 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)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1947,7 +1936,7 @@ name = "rand_core" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1979,7 +1968,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (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)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1991,7 +1980,7 @@ 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.61 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2111,7 +2100,7 @@ dependencies = [ "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", - "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -2125,7 +2114,7 @@ dependencies = [ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2168,7 +2157,7 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2202,7 +2191,7 @@ name = "sass-rs" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2211,8 +2200,8 @@ name = "sass-sys" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2259,7 +2248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2324,6 +2313,17 @@ dependencies = [ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "serde_urlencoded" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "sha-1" version = "0.8.1" @@ -2345,7 +2345,7 @@ name = "signal-hook" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2355,7 +2355,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arc-swap 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2381,7 +2381,7 @@ dependencies = [ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", - "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -2414,7 +2414,7 @@ version = "0.3.11" 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.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2512,7 +2512,7 @@ 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.9 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.11 (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.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2532,7 +2532,7 @@ version = "3.1.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)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2554,8 +2554,8 @@ dependencies = [ "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -2572,7 +2572,7 @@ dependencies = [ [[package]] name = "tera" -version = "1.0.0-beta.13" +version = "1.0.0-beta.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2637,7 +2637,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2732,7 +2732,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2807,7 +2807,7 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2994,8 +2994,8 @@ dependencies = [ "errors 0.1.0", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3076,6 +3076,11 @@ dependencies = [ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "wasi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "widestring" version = "0.4.0" @@ -3201,7 +3206,7 @@ dependencies = [ "rebuild 0.1.0", "site 0.1.0", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", "ws 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3211,7 +3216,7 @@ dependencies = [ "checksum actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2c11af4b06dc935d8e1b1491dad56bfb32febc49096a91e773f8535c176453" "checksum actix-connect 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "646be02316c497d1cb8b1ed82eb723b052d6b3e2462c94bd52d0ac2d4a29a165" "checksum actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e4640b28cd96059541c932f6f350c63c76688e43d68305cdb88e0004da12b5" -"checksum actix-http 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4d45d3f033fb7ff73467dad0ef1d12afb532b39953d50f4124f4d89451670583" +"checksum actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "de5aaeef8b9eef653b910f957a02bea9c1b375f7fa49b411fb75dad8f41462eb" "checksum actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "23224bb527e204261d0291102cb9b52713084def67d94f7874923baefe04ccf7" "checksum actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "18d9054b1cfacfa441846b9b99001010cb8fbb02130e6cfdb25cea36d3e98e87" "checksum actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb3038e9e457e0a498ea682723e0f4e6cc2c4f362a1868d749808355275ad959" @@ -3241,7 +3246,7 @@ dependencies = [ "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46" +"checksum cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "b548a4ee81fccb95919d4e22cfea83c7693ebfd78f0495493178db20b3139da7" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" "checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" @@ -3283,7 +3288,7 @@ dependencies = [ "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" "checksum filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f8c63033fcba1f51ef744505b3cad42510432b904c062afa67ad7ece008429d" -"checksum flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "550934ad4808d5d39365e5d61727309bf18b3b02c6c56b729cb92e7dd84bc3d8" +"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" @@ -3298,7 +3303,7 @@ dependencies = [ "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "72327b15c228bfe31f1390f93dd5e9279587f0463836393c9df719ce62a3e450" -"checksum getrandom 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "34f33de6f0ae7c9cb5e574502a562e2b512799e32abb801cd1e79ad952b62b49" +"checksum getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2512b3191f22e2763a5db387f1c9409379772e2050841722eb4a8c4f497bf096" "checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" @@ -3331,7 +3336,7 @@ dependencies = [ "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -"checksum libc 0.2.61 (registry+https://github.com/rust-lang/crates.io-index)" = "c665266eb592905e8503ba3403020f4b8794d26263f412ca33171600eca9a6fa" +"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" "checksum line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" @@ -3349,7 +3354,6 @@ dependencies = [ "checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" "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 miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4" "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" @@ -3424,7 +3428,7 @@ dependencies = [ "checksum reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0777154c2c3eb54f5c480db01de845652d941e47191277cc673634c3853939" "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb" "checksum rust-stemmers 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05928c187b85b38f6b98db43057a24f0245163635a5ce6325a4f77a833d646aa" -"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" +"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" "checksum safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e133ccc4f4d1cd4f89cc8a7ff618287d56dc7f638b8e38fc32c5fdcadc339dd5" @@ -3443,6 +3447,7 @@ dependencies = [ "checksum serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "01e69e1b8a631f245467ee275b8c757b818653c6d704cdbcaeb56b56767b529c" "checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" +"checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" "checksum signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68" @@ -3466,7 +3471,7 @@ dependencies = [ "checksum syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" -"checksum tera 1.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4892d0c45c56d7400d0e99b5c8ce08ed89dd0a2d1f8903f200c0e605123f6477" +"checksum tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)" = "a40589dd4e1d2c20d2eac3bfb3cef560bf86bd8591bad697e6e09bb4f248e8f6" "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" "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" @@ -3486,7 +3491,7 @@ dependencies = [ "checksum tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19" "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" -"checksum toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b8c96d7873fa7ef8bdeb3a9cda3ac48389b4154f32b9803b4bc26220b677b039" +"checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724" "checksum trust-dns-proto 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5559ebdf6c2368ddd11e20b11d6bbaf9e46deb803acd7815e93f5a7b4a6d2901" "checksum trust-dns-resolver 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9992e58dba365798803c0b91018ff6c8d3fc77e06977c4539af2a6bfe0a039" "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" @@ -3518,6 +3523,7 @@ dependencies = [ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" +"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" diff --git a/components/templates/src/builtins/rss.xml b/components/templates/src/builtins/rss.xml index 8f88973..aecb42b 100644 --- a/components/templates/src/builtins/rss.xml +++ b/components/templates/src/builtins/rss.xml @@ -2,7 +2,7 @@ {{ config.title }} - {{ config.base_url | safe }} + {{ config.base_url | escape_xml | safe }} {{ config.description }} Zola {{ config.default_language }} @@ -12,8 +12,8 @@ {{ page.title }} {{ page.date | date(format="%a, %d %b %Y %H:%M:%S %z") }} - {{ page.permalink | safe }} - {{ page.permalink | safe }} + {{ page.permalink | escape_xml | safe }} + {{ page.permalink | escape_xml | safe }} {% if page.summary %}{{ page.summary }}{% else %}{{ page.content }}{% endif %} {% endfor %} diff --git a/components/templates/src/builtins/sitemap.xml b/components/templates/src/builtins/sitemap.xml index 171ae2e..0c2608a 100644 --- a/components/templates/src/builtins/sitemap.xml +++ b/components/templates/src/builtins/sitemap.xml @@ -2,7 +2,7 @@ {% for sitemap_entry in entries %} - {{ sitemap_entry.permalink | safe }} + {{ sitemap_entry.permalink | escape_xml | safe }} {% if sitemap_entry.date %} {{ sitemap_entry.date }} {% endif %} From 6a7e955ab0f0f79d3ccd13cf1dec9b7bf7dd5a24 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Thu, 15 Aug 2019 22:14:53 +0200 Subject: [PATCH 49/67] Add lang to get_taxonomy & get_taxonomy_url --- CHANGELOG.md | 2 + components/library/src/pagination/mod.rs | 2 + components/library/src/taxonomies/mod.rs | 1 + components/site/src/lib.rs | 4 +- components/templates/src/global_fns/mod.rs | 80 +++++++++++++++---- .../documentation/templates/pagination.md | 6 +- test_site_i18n/templates/page.html | 3 + 7 files changed, 78 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbcddba..363e49b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ - Taxonomies can now have the same name in multiple languages - `zola init` can now be create sites inside the current directory - Fix table of contents generation for deep heading levels +- Add `lang` in all templates context except sitemap, robots etc +- Add `lang` parameter to `get_taxonomy` and `get_taxonomy_url` ## 0.8.0 (2019-06-22) diff --git a/components/library/src/pagination/mod.rs b/components/library/src/pagination/mod.rs index 2fc9203..f79dad3 100644 --- a/components/library/src/pagination/mod.rs +++ b/components/library/src/pagination/mod.rs @@ -211,10 +211,12 @@ impl<'a> Paginator<'a> { PaginationRoot::Section(s) => { context .insert("section", &SerializingSection::from_section_basic(s, Some(library))); + context.insert("lang", &s.lang); } PaginationRoot::Taxonomy(t, item) => { context.insert("taxonomy", &t.kind); context.insert("term", &item.serialize(library)); + context.insert("lang", &t.kind.lang); } }; context.insert("current_url", &pager.permalink); diff --git a/components/library/src/taxonomies/mod.rs b/components/library/src/taxonomies/mod.rs index 7486ce8..4f5d8fa 100644 --- a/components/library/src/taxonomies/mod.rs +++ b/components/library/src/taxonomies/mod.rs @@ -169,6 +169,7 @@ impl Taxonomy { self.items.iter().map(|i| SerializedTaxonomyItem::from_item(i, library)).collect(); context.insert("terms", &terms); context.insert("taxonomy", &self.kind); + context.insert("lang", &self.kind.lang); context.insert("current_url", &config.make_permalink(&self.kind.name)); context.insert("current_path", &self.kind.name); diff --git a/components/site/src/lib.rs b/components/site/src/lib.rs index 5ee73a9..c7a0bf4 100644 --- a/components/site/src/lib.rs +++ b/components/site/src/lib.rs @@ -525,7 +525,7 @@ impl Site { self.tera.register_function("trans", global_fns::Trans::new(self.config.clone())); self.tera.register_function( "get_taxonomy_url", - global_fns::GetTaxonomyUrl::new(&self.taxonomies), + global_fns::GetTaxonomyUrl::new(&self.config.default_language,&self.taxonomies), ); } @@ -540,7 +540,7 @@ impl Site { ); self.tera.register_function( "get_taxonomy", - global_fns::GetTaxonomy::new(self.taxonomies.clone(), self.library.clone()), + global_fns::GetTaxonomy::new(&self.config.default_language, self.taxonomies.clone(), self.library.clone()), ); } diff --git a/components/templates/src/global_fns/mod.rs b/components/templates/src/global_fns/mod.rs index 1851295..c84b6da 100644 --- a/components/templates/src/global_fns/mod.rs +++ b/components/templates/src/global_fns/mod.rs @@ -176,18 +176,19 @@ impl TeraFn for GetImageMeta { #[derive(Debug)] pub struct GetTaxonomyUrl { taxonomies: HashMap>, + default_lang: String, } impl GetTaxonomyUrl { - pub fn new(all_taxonomies: &[Taxonomy]) -> Self { + pub fn new(default_lang: &str, all_taxonomies: &[Taxonomy]) -> Self { let mut taxonomies = HashMap::new(); - for taxonomy in all_taxonomies { + for taxo in all_taxonomies { let mut items = HashMap::new(); - for item in &taxonomy.items { + for item in &taxo.items { items.insert(item.name.clone(), item.permalink.clone()); } - taxonomies.insert(taxonomy.kind.name.clone(), items); + taxonomies.insert(format!("{}-{}", taxo.kind.name, taxo.kind.lang), items); } - Self { taxonomies } + Self { taxonomies, default_lang: default_lang.to_string() } } } impl TeraFn for GetTaxonomyUrl { @@ -202,7 +203,10 @@ impl TeraFn for GetTaxonomyUrl { args.get("name"), "`get_taxonomy_url` requires a `name` argument with a string value" ); - let container = match self.taxonomies.get(&kind) { + let lang = optional_arg!(String, args.get("lang"), "`get_taxonomy`: `lang` must be a string") + .unwrap_or_else(|| self.default_lang.clone()); + + let container = match self.taxonomies.get(&format!("{}-{}", kind, lang)) { Some(c) => c, None => { return Err(format!( @@ -289,14 +293,15 @@ impl TeraFn for GetSection { pub struct GetTaxonomy { library: Arc>, taxonomies: HashMap, + default_lang: String, } impl GetTaxonomy { - pub fn new(all_taxonomies: Vec, library: Arc>) -> Self { + pub fn new(default_lang: &str, all_taxonomies: Vec, library: Arc>) -> Self { let mut taxonomies = HashMap::new(); for taxo in all_taxonomies { - taxonomies.insert(taxo.kind.name.clone(), taxo); + taxonomies.insert(format!("{}-{}", taxo.kind.name, taxo.kind.lang), taxo); } - Self { taxonomies, library } + Self { taxonomies, library, default_lang: default_lang.to_string() } } } impl TeraFn for GetTaxonomy { @@ -307,7 +312,10 @@ impl TeraFn for GetTaxonomy { "`get_taxonomy` requires a `kind` argument with a string value" ); - match self.taxonomies.get(&kind) { + let lang = optional_arg!(String, args.get("lang"), "`get_taxonomy`: `lang` must be a string") + .unwrap_or_else(|| self.default_lang.clone()); + + match self.taxonomies.get(&format!("{}-{}", kind, lang)) { Some(t) => Ok(to_value(t.to_serialized(&self.library.read().unwrap())).unwrap()), None => { Err(format!("`get_taxonomy` received an unknown taxonomy as kind: {}", kind).into()) @@ -376,6 +384,11 @@ mod tests { lang: config.default_language.clone(), ..TaxonomyConfig::default() }; + let taxo_config_fr = TaxonomyConfig { + name: "tags".to_string(), + lang: "fr".to_string(), + ..TaxonomyConfig::default() + }; let library = Arc::new(RwLock::new(Library::new(0, 0, false))); let tag = TaxonomyItem::new( "Programming", @@ -384,10 +397,19 @@ mod tests { vec![], &library.read().unwrap(), ); + let tag_fr = TaxonomyItem::new( + "Programmation", + &taxo_config_fr, + &config, + vec![], + &library.read().unwrap(), + ); let tags = Taxonomy { kind: taxo_config, items: vec![tag] }; + let tags_fr = Taxonomy { kind: taxo_config_fr, items: vec![tag_fr] }; - let taxonomies = vec![tags.clone()]; - let static_fn = GetTaxonomy::new(taxonomies.clone(), library.clone()); + let taxonomies = vec![tags.clone(), tags_fr.clone()]; + let static_fn = GetTaxonomy::new(&config.default_language, taxonomies.clone(), library.clone()) + ; // can find it correctly let mut args = HashMap::new(); args.insert("kind".to_string(), to_value("tags").unwrap()); @@ -412,6 +434,19 @@ mod tests { res_obj["items"].clone().as_array().unwrap()[0].clone().as_object().unwrap()["pages"], Value::Array(vec![]) ); + // Works with other languages as well + let mut args = HashMap::new(); + args.insert("kind".to_string(), to_value("tags").unwrap()); + args.insert("lang".to_string(), to_value("fr").unwrap()); + let res = static_fn.call(&args).unwrap(); + let res_obj = res.as_object().unwrap(); + assert_eq!(res_obj["kind"], to_value(tags_fr.kind).unwrap()); + assert_eq!(res_obj["items"].clone().as_array().unwrap().len(), 1); + assert_eq!( + res_obj["items"].clone().as_array().unwrap()[0].clone().as_object().unwrap()["name"], + Value::String("Programmation".to_string()) + ); + // and errors if it can't find it let mut args = HashMap::new(); args.insert("kind".to_string(), to_value("something-else").unwrap()); @@ -426,12 +461,19 @@ mod tests { lang: config.default_language.clone(), ..TaxonomyConfig::default() }; + let taxo_config_fr = TaxonomyConfig { + name: "tags".to_string(), + lang: "fr".to_string(), + ..TaxonomyConfig::default() + }; let library = Library::new(0, 0, false); let tag = TaxonomyItem::new("Programming", &taxo_config, &config, vec![], &library); + let tag_fr = TaxonomyItem::new("Programmation", &taxo_config_fr, &config, vec![], &library); let tags = Taxonomy { kind: taxo_config, items: vec![tag] }; + let tags_fr = Taxonomy { kind: taxo_config_fr, items: vec![tag_fr] }; - let taxonomies = vec![tags.clone()]; - let static_fn = GetTaxonomyUrl::new(&taxonomies); + let taxonomies = vec![tags.clone(), tags_fr.clone()]; + let static_fn = GetTaxonomyUrl::new(&config.default_language, &taxonomies); // can find it correctly let mut args = HashMap::new(); args.insert("kind".to_string(), to_value("tags").unwrap()); @@ -440,6 +482,16 @@ mod tests { static_fn.call(&args).unwrap(), to_value("http://a-website.com/tags/programming/").unwrap() ); + // works with other languages + let mut args = HashMap::new(); + args.insert("kind".to_string(), to_value("tags").unwrap()); + args.insert("name".to_string(), to_value("Programmation").unwrap()); + args.insert("lang".to_string(), to_value("fr").unwrap()); + assert_eq!( + static_fn.call(&args).unwrap(), + to_value("http://a-website.com/fr/tags/programmation/").unwrap() + ); + // and errors if it can't find it let mut args = HashMap::new(); args.insert("kind".to_string(), to_value("tags").unwrap()); diff --git a/docs/content/documentation/templates/pagination.md b/docs/content/documentation/templates/pagination.md index e50d92b..d6d4ed1 100644 --- a/docs/content/documentation/templates/pagination.md +++ b/docs/content/documentation/templates/pagination.md @@ -5,10 +5,8 @@ weight = 30 Two things can get paginated: a section and a taxonomy term. -A paginated section gets the same `section` variable as a normal -[section page](@/documentation/templates/pages-sections.md#section-variables) minus its pages -while both a paginated taxonomy page and a paginated section page gets a -`paginator` variable of the `Pager` type: +Both kinds get a `paginator` variable of the `Pager` type, on top of the common variables mentioned in the +[overview page](@/documentation/templates/overview.md): ```ts // How many items per pager diff --git a/test_site_i18n/templates/page.html b/test_site_i18n/templates/page.html index 585468d..7f7b9fb 100644 --- a/test_site_i18n/templates/page.html +++ b/test_site_i18n/templates/page.html @@ -6,3 +6,6 @@ Language: {{lang}} Translated in {{t.lang|default(value=config.default_language)}}: {{t.title}} {{t.permalink|safe}} {% endfor %} +{% for taxo_kind, items in page.taxonomies %} + {% set taxo = get_taxonomy(kind=taxo_kind, lang=lang) %} +{% endfor %} \ No newline at end of file From 4fff7508ba16db35ec48e635d3bf59e5ab39e67b Mon Sep 17 00:00:00 2001 From: Ever Date: Sun, 25 Aug 2019 01:05:02 +0800 Subject: [PATCH 50/67] ADD: reload when themes change (#771) * ADD: reload when themes change close #713 * MOD: test can_detect_kind_of_changes --- src/cmd/serve.rs | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs index c02d872..080eaf2 100644 --- a/src/cmd/serve.rs +++ b/src/cmd/serve.rs @@ -52,6 +52,7 @@ use rebuild; enum ChangeKind { Content, Templates, + Themes, StaticFiles, Sass, Config, @@ -155,6 +156,7 @@ pub fn serve( // Setup watchers let mut watching_static = false; let mut watching_templates = false; + let mut watching_themes = false; let (tx, rx) = channel(); let mut watcher = watcher(tx, Duration::from_secs(1)).unwrap(); watcher @@ -178,6 +180,13 @@ pub fn serve( .map_err(|e| ZolaError::chain("Can't watch the `templates` folder.", e))?; } + if Path::new("themes").exists() { + watching_themes = true; + watcher + .watch("themes/", RecursiveMode::Recursive) + .map_err(|e| ZolaError::chain("Can't watch the `themes` folder.", e))?; + } + // Sass support is optional so don't make it an error to no have a sass folder let _ = watcher.watch("sass/", RecursiveMode::Recursive); @@ -248,6 +257,9 @@ pub fn serve( if watching_templates { watchers.push("templates"); } + if watching_themes { + watchers.push("themes"); + } if site.config.compile_sass { watchers.push("sass"); } @@ -362,6 +374,19 @@ pub fn serve( ChangeKind::Templates => reload_templates(&mut site, &path), ChangeKind::StaticFiles => copy_static(&site, &path, &partial_path), ChangeKind::Sass => reload_sass(&site, &path, &partial_path), + ChangeKind::Themes => { + console::info("-> Themes changed. The whole site will be reloaded."); + site = create_new_site( + interface, + port, + output_dir, + base_url, + config_file, + ) + .unwrap() + .0; + rebuild_done_handling(&broadcaster, Ok(()), "/x.js"); + }, ChangeKind::Config => { console::info("-> Config changed. The whole site will be reloaded. The browser needs to be refreshed to make the changes visible."); site = create_new_site( @@ -406,6 +431,19 @@ pub fn serve( (ChangeKind::Templates, _) => reload_templates(&mut site, &path), (ChangeKind::StaticFiles, p) => copy_static(&site, &path, &p), (ChangeKind::Sass, p) => reload_sass(&site, &path, &p), + (ChangeKind::Themes, _) => { + console::info("-> Themes changed. The whole site will be reloaded."); + site = create_new_site( + interface, + port, + output_dir, + base_url, + config_file, + ) + .unwrap() + .0; + rebuild_done_handling(&broadcaster, Ok(()), "/x.js"); + }, (ChangeKind::Config, _) => { console::info("-> Config changed. The whole site will be reloaded. The browser needs to be refreshed to make the changes visible."); site = create_new_site( @@ -471,6 +509,8 @@ fn detect_change_kind(pwd: &Path, path: &Path) -> (ChangeKind, PathBuf) { let change_kind = if partial_path.starts_with("/templates") { ChangeKind::Templates + } else if partial_path.starts_with("/themes") { + ChangeKind::Themes } else if partial_path.starts_with("/content") { ChangeKind::Content } else if partial_path.starts_with("/static") { @@ -527,6 +567,11 @@ mod tests { Path::new("/home/vincent/site"), Path::new("/home/vincent/site/templates/hello.html"), ), + ( + (ChangeKind::Themes, PathBuf::from("/themes/hello.html")), + Path::new("/home/vincent/site"), + Path::new("/home/vincent/site/themes/hello.html"), + ), ( (ChangeKind::StaticFiles, PathBuf::from("/static/site.css")), Path::new("/home/vincent/site"), From beb5a3af4169c3244091d56c922d4d26394a2d81 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Sat, 24 Aug 2019 19:06:07 +0200 Subject: [PATCH 51/67] Universalize the GitHub pages publishing scheme (#780) Added instructions on how to publish to .github.io or .github.io by changing the publishing branch in the repo to `master`. This should work for any type of GitHub publishing, including custom domains. Fixes #765 --- docs/content/documentation/deployment/github-pages.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/content/documentation/deployment/github-pages.md b/docs/content/documentation/deployment/github-pages.md index 049307c..b9a60a2 100644 --- a/docs/content/documentation/deployment/github-pages.md +++ b/docs/content/documentation/deployment/github-pages.md @@ -4,8 +4,7 @@ weight = 30 +++ By default, GitHub Pages uses Jekyll (A ruby based static site generator), -but you can use whatever you want provided you have an `index.html` file in the root of a branch called `gh-pages`. -That branch name can also be manually changed in the settings of a repository. +but you can also publish any generated files provided you have an `index.html` file in the root of a branch called `gh-pages` or `master`, in addition you can also publish from a `docs` directory in your repository. That branch name can also be manually changed in the settings of a repository. **However** this only applies to publishing in a custom domain, i.e. if you want to publish to a GitHub provided web service under the `github.io` domain, you can **only** use the `master` branch of your repository as explained [here](https://help.github.com/en/articles/configuring-a-publishing-source-for-github-pages), so we will focus on the method which will work regardless of the domain. We can use any CI server to build and deploy our site. For example: @@ -45,6 +44,8 @@ Make sure "Display value in build log" is off, and then click add. Now Travis ha We're almost done. We just need some scripts in a .travis.yml file to tell Travis what to do. +**NOTE**: The script below assumes that we're taking the code from the `code` branch and will generate the HTML to be published in the `master` branch of the same repository. You're free to use any other branch for the Markdown files but if you want to use `.github.io` or `.github.io`, the destination branch **MUST** be `master`. + ```yaml language: minimal @@ -59,12 +60,12 @@ script: # If you are using a different folder than `public` for the output directory, you will # need to change the `zola` command and the `ghp-import` path after_success: | - [ $TRAVIS_BRANCH = master ] && + [ $TRAVIS_BRANCH = code ] && [ $TRAVIS_PULL_REQUEST = false ] && zola build && sudo pip install ghp-import && - ghp-import -n public && - git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages + ghp-import -n public -b master && + git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git master ``` If your site is using a custom domain, you will need to mention it in the `ghp-import` command: `ghp-import -c vaporsoft.net -n public` From 258aecec3408556c3ccc827ca5ea91fdd89ec6da Mon Sep 17 00:00:00 2001 From: BilLOPGVkPPn8z0JGJhgiAGNo9YAqpk5ruChl0F <12755239+BilLOPGVkPPn8z0JGJhgiAGNo9YAqpk5ruChl0F@users.noreply.github.com> Date: Sat, 24 Aug 2019 10:06:41 -0700 Subject: [PATCH 52/67] Add one-dark syntax highlight theme (#784) --- .../getting-started/configuration.md | 1 + sublime_themes/all.themedump | Bin 23047 -> 23892 bytes sublime_themes/one-dark.tmTheme | 876 ++++++++++++++++++ 3 files changed, 877 insertions(+) create mode 100644 sublime_themes/one-dark.tmTheme diff --git a/docs/content/documentation/getting-started/configuration.md b/docs/content/documentation/getting-started/configuration.md index f580f70..de95efb 100644 --- a/docs/content/documentation/getting-started/configuration.md +++ b/docs/content/documentation/getting-started/configuration.md @@ -129,6 +129,7 @@ Zola currently has the following highlight themes available: - [ayu-dark](https://github.com/dempfi/ayu) - [ayu-mirage](https://github.com/dempfi/ayu) - [Tomorrow](https://tmtheme-editor.herokuapp.com/#!/editor/theme/Tomorrow) +- [one-dark](https://github.com/andresmichel/one-dark-theme) Zola uses the Sublime Text themes, making it very easy to add more. If you want a theme not on that list, please open an issue or a pull request on the [Zola repo](https://github.com/getzola/zola). diff --git a/sublime_themes/all.themedump b/sublime_themes/all.themedump index cc57a1f2c538c0ad87b70fa320eec90e5f3e9a91..4fe6bfc9dcf01de9286b9a88e495b9e6f653ac05 100644 GIT binary patch delta 23873 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 diff --git a/sublime_themes/one-dark.tmTheme b/sublime_themes/one-dark.tmTheme new file mode 100644 index 0000000..e1a0c3b --- /dev/null +++ b/sublime_themes/one-dark.tmTheme @@ -0,0 +1,876 @@ + + + + + author + IceTimux / Andres Michel + name + One Dark + settings + + + settings + + foreground + #6c7079 + background + #2B303B + invisibles + #747369 + caret + #528bff + lineHighlight + #8cc2fc0b + bracketContentsOptions + underline + bracketContentsForeground + #528bff + bracketsOptions + underline + bracketsForeground + #528bff + tagsOptions + underline + tagsForeground + #528bff + findHighlight + #314365 + findHighlightForeground + #528bff + gutter + #2B303B + gutterForeground + #636d8388 + selection + #bbccf51b + selectionBorder + #bbccf51b + inactiveSelection + #bbccf51b + guide + #464c55 + activeGuide + #464c55 + stackGuide + #464c55 + highlight + #528bff80 + highlightForeground + #528bff + shadow + #2B303B + shadowWidth + 1 + + + + name + Text and source + scope + text, source + settings + + foreground + #abb2bf + + + + name + Text + scope + variable.parameter.function + settings + + foreground + #adb7c9 + + + + name + Comments + scope + comment, punctuation.definition.comment + settings + + foreground + #5f697a + fontStyle + italic + + + + name + Delimiters + scope + none + settings + + foreground + #adb7c9 + + + + name + Operators + scope + keyword.operator + settings + + foreground + #adb7c9 + + + + name + Keywords + scope + keyword + settings + + foreground + #cd74e8 + + + + name + Variables + scope + variable + settings + + foreground + #eb6772 + + + + name + Functions + scope + entity.name.function, meta.require, support.function.any-method + settings + + foreground + #5cb3fa + + + + name + Classes + scope + support.class, entity.name.class, entity.name.type.class + settings + + foreground + #f0c678 + + + + name + Classes + scope + meta.class + settings + + foreground + #adb7c9 + + + + name + Methods + scope + keyword.other.special-method + settings + + foreground + #5cb3fa + + + + name + Storage + scope + storage + settings + + foreground + #cd74e8 + + + + name + Support + scope + support.function + settings + + foreground + #5ebfcc + + + + name + Strings, Inherited Class + scope + string, constant.other.symbol, entity.other.inherited-class + settings + + foreground + #9acc76 + + + + name + Integers + scope + constant.numeric + settings + + foreground + #db9d63 + + + + name + Floats + scope + none + settings + + foreground + #db9d63 + + + + name + Boolean + scope + none + settings + + foreground + #db9d63 + + + + name + Constants + scope + constant + settings + + foreground + #db9d63 + + + + name + Tags + scope + entity.name.tag + settings + + foreground + #eb6772 + + + + name + Attributes + scope + entity.other.attribute-name + settings + + foreground + #db9d63 + + + + name + Attribute IDs + scope + entity.other.attribute-name.id, punctuation.definition.entity + settings + + foreground + #db9d63 + + + + name + Selector + scope + meta.selector + settings + + foreground + #cd74e8 + + + + name + Values + scope + none + settings + + foreground + #db9d63 + + + + name + Headings + scope + markup.heading punctuation.definition.heading, entity.name.section + settings + + fontStyle + + foreground + #5cb3fa + + + + name + Units + scope + keyword.other.unit + settings + + foreground + #db9d63 + + + + name + Bold + scope + markup.bold, punctuation.definition.bold + settings + + foreground + #f0c678 + + + + name + Italic + scope + markup.italic, punctuation.definition.italic + settings + + foreground + #cd74e8 + + + + name + Code + scope + markup.raw.inline + settings + + foreground + #9acc76 + + + + name + Link Text + scope + string.other.link, punctuation.definition.string.end.markdown + settings + + foreground + #eb6772 + + + + name + Link Url + scope + meta.link + settings + + foreground + #db9d63 + + + + name + Lists + scope + markup.list + settings + + foreground + #eb6772 + + + + name + Quotes + scope + markup.quote + settings + + foreground + #db9d63 + + + + name + Separator + scope + meta.separator + settings + + background + #515151 + foreground + #adb7c9 + + + + name + Inserted + scope + markup.inserted + settings + + foreground + #9acc76 + + + + name + Deleted + scope + markup.deleted + settings + + foreground + #eb6772 + + + + name + Changed + scope + markup.changed + settings + + foreground + #cd74e8 + + + + name + Colors + scope + constant.other.color + settings + + foreground + #5ebfcc + + + + name + Regular Expressions + scope + string.regexp + settings + + foreground + #5ebfcc + + + + name + Escape Characters + scope + constant.character.escape + settings + + foreground + #5ebfcc + + + + name + Embedded + scope + punctuation.section.embedded, variable.interpolation + settings + + foreground + #c94e42 + + + + name + Illegal + scope + invalid.illegal + settings + + foreground + #ffffff + background + #e05252 + + + + name + Broken + scope + invalid.broken + settings + + background + #f99157 + foreground + #2d2d2d + + + + name + Deprecated + scope + invalid.deprecated + settings + + background + #d27b53 + foreground + #2c323d + + + + name + Unimplemented + scope + invalid.unimplemented + settings + + background + #747369 + foreground + #2c323d + + + + name + Json key + scope + source.json meta.structure.dictionary.json string.quoted.double.json + settings + + foreground + #eb6772 + + + + name + Json value + scope + source.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json + settings + + foreground + #9acc76 + + + + name + json sub key + scope + source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json string.quoted.double.json + settings + + foreground + #eb6772 + + + + name + Json sub value + scope + source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json + settings + + foreground + #9acc76 + + + + name + laravel blade tag + scope + text.html.laravel-blade source.php.embedded.line.html entity.name.tag.laravel-blade + settings + + foreground + #cd74e8 + + + + name + laravel blade @ + scope + text.html.laravel-blade source.php.embedded.line.html support.constant.laravel-blade + settings + + foreground + #cd74e8 + + + + name + python function parameter + scope + source.python meta.function.python meta.function.parameters.python variable.parameter.function.python + settings + + foreground + #db9d63 + + + + name + python meta function + scope + source.python meta.function-call.python support.type.python + settings + + foreground + #5ebfcc + + + + name + python logical keyword + scope + source.python keyword.operator.logical.python + settings + + foreground + #cd74e8 + + + + name + python class ( begin + scope + source.python meta.class.python punctuation.definition.inheritance.begin.python + settings + + foreground + #f0c678 + + + + name + python class ) end + scope + source.python meta.class.python punctuation.definition.inheritance.end.python + settings + + foreground + #f0c678 + + + + name + python function call parameter name + scope + source.python meta.function-call.python meta.function-call.arguments.python variable.parameter.function.python + settings + + foreground + #db9d63 + + + + name + php fcuntion constants + scope + text.html.basic source.php.embedded.block.html support.constant.std.php + settings + + foreground + #db9d63 + + + + name + php namespace name + scope + text.html.basic source.php.embedded.block.html meta.namespace.php entity.name.type.namespace.php + settings + + foreground + #f0c678 + + + + name + javascript meta constant + scope + source.js meta.function.js support.constant.js + settings + + foreground + #db9d63 + + + + name + php namespace in top + scope + text.html.basic` source.php.embedded.block.html constant.other.php + settings + + foreground + #cd74e8 + + + + name + php namespace name in top + scope + text.html.basic source.php.embedded.block.html support.other.namespace.php + settings + + foreground + #db9d63 + + + + name + latex label names + scope + text.tex.latex meta.function.environment.math.latex string.other.math.block.environment.latex meta.definition.label.latex variable.parameter.definition.label.latex + settings + + foreground + #adb7c9 + + + + name + latex italic emph + scope + text.tex.latex meta.function.emph.latex markup.italic.emph.latex + settings + + fontStyle + italic + foreground + #cd74e8 + + + + name + subl_new js vars + scope + source.js variable.other.readwrite.js + settings + + foreground + #adb7c9 + + + + name + new_subl js $ + scope + source.js meta.function-call.with-arguments.js variable.function.js + settings + + foreground + #adb7c9 + + + + name + new_subl js call method + scope + source.js meta.group.braces.round meta.group.braces.curly meta.function-call.method.without-arguments.js variable.function.js + settings + + foreground + #adb7c9 + + + + name + new_subl e js + scope + source.js meta.group.braces.round meta.group.braces.curly variable.other.object.js + settings + + foreground + #adb7c9 + + + + name + new_subl js key + scope + source.js meta.group.braces.round meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js + settings + + foreground + #adb7c9 + + + + name + new_subl obejct key + scope + source.js meta.group.braces.round meta.group.braces.curly constant.other.object.key.js punctuation.separator.key-value.js + settings + + foreground + #adb7c9 + + + + name + new_subl js method with args + scope + source.js meta.group.braces.round meta.group.braces.curly meta.function-call.method.with-arguments.js variable.function.js + settings + + foreground + #adb7c9 + + + + name + new_subl js variable function + scope + source.js meta.function-call.method.with-arguments.js variable.function.js + settings + + foreground + #adb7c9 + + + + name + new_subl variabel function method + scope + source.js meta.function-call.method.without-arguments.js variable.function.js + settings + + foreground + #adb7c9 + + + + + From 57691be90d560c4a080b0181083113f242a4aae0 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sat, 24 Aug 2019 19:13:26 +0200 Subject: [PATCH 53/67] Update changelog --- CHANGELOG.md | 2 + Cargo.lock | 214 +++++++++++++++++++++++++++++---------------------- Cargo.toml | 1 - 3 files changed, 126 insertions(+), 91 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 363e49b..f49dceb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ - Fix table of contents generation for deep heading levels - Add `lang` in all templates context except sitemap, robots etc - Add `lang` parameter to `get_taxonomy` and `get_taxonomy_url` +- Rebuild whole site on changes in `themes` changes +- Add one-dark syntax highlighting theme ## 0.8.0 (2019-06-22) diff --git a/Cargo.lock b/Cargo.lock index 959b5e6..b1da8eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,7 +73,7 @@ dependencies = [ "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 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)", @@ -81,7 +81,7 @@ dependencies = [ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (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_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -102,7 +102,7 @@ dependencies = [ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -213,7 +213,7 @@ dependencies = [ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (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_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -287,12 +287,12 @@ dependencies = [ [[package]] name = "autocfg" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "backtrace" -version = "0.3.34" +version = "0.3.35" 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)", @@ -323,9 +323,9 @@ name = "bincode" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -360,7 +360,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -410,7 +410,7 @@ 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)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -424,7 +424,7 @@ dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -449,8 +449,8 @@ dependencies = [ "errors 0.1.0", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -475,7 +475,7 @@ dependencies = [ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (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)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -574,7 +574,7 @@ dependencies = [ "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "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.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -647,8 +647,8 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rust-stemmers 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", "strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -734,7 +734,7 @@ name = "error-chain" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -753,7 +753,7 @@ name = "failure" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", ] @@ -820,8 +820,8 @@ dependencies = [ "errors 0.1.0", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -901,15 +901,15 @@ dependencies = [ [[package]] name = "getopts" -version = "0.2.19" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "getrandom" -version = "0.1.9" +version = "0.1.10" 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)", @@ -962,7 +962,7 @@ dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1153,7 +1153,7 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1258,8 +1258,8 @@ dependencies = [ "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rendering 0.1.0", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", "slotmap 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1273,7 +1273,7 @@ name = "line-wrap" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1281,7 +1281,7 @@ name = "link_checker" version = "0.1.0" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1345,8 +1345,8 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1467,7 +1467,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1548,7 +1548,7 @@ name = "num-integer" version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", ] @@ -1557,7 +1557,7 @@ name = "num-iter" version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.6 (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)", ] @@ -1567,7 +1567,7 @@ name = "num-rational" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.6 (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)", ] @@ -1577,7 +1577,7 @@ name = "num-traits" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1631,7 +1631,7 @@ dependencies = [ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1641,10 +1641,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "openssl-sys" -version = "0.9.48" +version = "0.9.49" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.40 (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)", @@ -1801,7 +1801,7 @@ dependencies = [ "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)", "line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1834,6 +1834,14 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "proc-macro2" +version = "1.0.1" +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)", +] + [[package]] name = "publicsuffix" version = "1.5.2" @@ -1852,7 +1860,7 @@ version = "0.5.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)", - "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", + "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1870,12 +1878,20 @@ dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "quote" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1893,7 +1909,7 @@ name = "rand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1905,7 +1921,7 @@ name = "rand_chacha" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1936,7 +1952,7 @@ name = "rand_core" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1991,7 +2007,7 @@ name = "rand_pcg" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2095,8 +2111,8 @@ dependencies = [ "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", @@ -2106,7 +2122,7 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.9.19" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2123,7 +2139,7 @@ dependencies = [ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (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_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2151,8 +2167,8 @@ name = "rust-stemmers" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", ] [[package]] @@ -2175,7 +2191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "safemem" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2275,20 +2291,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.98" +version = "1.0.99" 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)", + "proc-macro2 1.0.1 (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.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2296,10 +2312,10 @@ name = "serde_json" version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "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.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2309,7 +2325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2320,7 +2336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2377,8 +2393,8 @@ dependencies = [ "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "search 0.1.0", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2441,7 +2457,7 @@ dependencies = [ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2494,6 +2510,16 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "syn" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (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" @@ -2519,8 +2545,8 @@ dependencies = [ "onig 4.3.3 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (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)", "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2552,7 +2578,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "library 0.1.0", "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2582,7 +2608,7 @@ dependencies = [ "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.98 (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)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "unic-segment 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2594,7 +2620,7 @@ name = "termcolor" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2602,7 +2628,7 @@ name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2810,7 +2836,7 @@ name = "toml" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2953,7 +2979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicode-width" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2961,6 +2987,11 @@ name = "unicode-xid" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "unicode-xid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "url" version = "1.7.2" @@ -2992,7 +3023,7 @@ name = "utils" version = "0.1.0" dependencies = [ "errors 0.1.0", - "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3125,7 +3156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wincolor" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3206,7 +3237,6 @@ dependencies = [ "rebuild 0.1.0", "site 0.1.0", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", "ws 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3233,8 +3263,8 @@ dependencies = [ "checksum arc-swap 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "854ede29f7a0ce90519fb2439d030320c6201119b87dab0ee96044603e1130b9" "checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" -"checksum backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)" = "b5164d292487f037ece34ec0de2fcede2faa162f085dd96d2385ab81b12765ba" +"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 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" @@ -3302,8 +3332,8 @@ dependencies = [ "checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -"checksum getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "72327b15c228bfe31f1390f93dd5e9279587f0463836393c9df719ce62a3e450" -"checksum getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2512b3191f22e2763a5db387f1c9409379772e2050841722eb4a8c4f497bf096" +"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +"checksum getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6171a6cc63fbabbe27c2b5ee268e8b7fe5dc1eb0dd2dfad537c1dfed6f69117e" "checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" @@ -3324,7 +3354,7 @@ dependencies = [ "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" "checksum ignore 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7" "checksum image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)" = "663a975007e0b49903e2e8ac0db2c432c465855f2d65f17883ba1476e85f0b42" -"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" +"checksum indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4d6d89e0948bf10c08b9ecc8ac5b83f07f857ebe2c0cbe38de15b4e4f510356" "checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" "checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718" "checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" @@ -3377,7 +3407,7 @@ dependencies = [ "checksum open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "94b424e1086328b0df10235c6ff47be63708071881bead9e76997d9291c0134b" "checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -"checksum openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)" = "b5ba300217253bcc5dc68bed23d782affa45000193866e025329aa8a7a9f05b8" +"checksum openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)" = "f4fad9e54bd23bd4cbbe48fdc08a1b8091707ac869ef8508edea2fec77dcc884" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" @@ -3399,10 +3429,12 @@ dependencies = [ "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +"checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802" "checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d" "checksum pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "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 rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" "checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" @@ -3425,13 +3457,13 @@ dependencies = [ "checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9" "checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -"checksum reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0777154c2c3eb54f5c480db01de845652d941e47191277cc673634c3853939" +"checksum reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0f6d896143a583047512e59ac54a215cb203c29cc941917343edea3be8df9c78" "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb" "checksum rust-stemmers 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05928c187b85b38f6b98db43057a24f0245163635a5ce6325a4f77a833d646aa" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" -"checksum safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e133ccc4f4d1cd4f89cc8a7ff618287d56dc7f638b8e38fc32c5fdcadc339dd5" +"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 sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd" "checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972" @@ -3443,8 +3475,8 @@ dependencies = [ "checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113" -"checksum serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "01e69e1b8a631f245467ee275b8c757b818653c6d704cdbcaeb56b56767b529c" +"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 serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" @@ -3467,6 +3499,7 @@ dependencies = [ "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +"checksum syn 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c65d951ab12d976b61a41cf9ed4531fc19735c6e6d84a4bb1453711e762ec731" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" @@ -3508,8 +3541,9 @@ dependencies = [ "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-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" "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 utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" @@ -3531,7 +3565,7 @@ dependencies = [ "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-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" +"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" "checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" "checksum ws 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6f5bb86663ff4d1639408410f50bf6050367a8525d644d49a6894cd618a631" diff --git a/Cargo.toml b/Cargo.toml index c0aecaf..065a70b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,6 @@ atty = "0.2.11" clap = "2" chrono = "0.4" lazy_static = "1.1.0" -toml = "0.5" termcolor = "1.0.4" # Used in init to ensure the url given as base_url is a valid one url = "2" From b396a1bc20b00400b732f96ee9f4d984e856535c Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sat, 24 Aug 2019 22:23:08 +0200 Subject: [PATCH 54/67] Add --drafts flag + rustfmt --- CHANGELOG.md | 4 +-- Cargo.lock | 8 +++--- components/config/src/config.rs | 2 +- components/front_matter/src/page.rs | 2 +- components/front_matter/src/section.rs | 2 +- components/imageproc/src/lib.rs | 2 +- components/library/src/pagination/mod.rs | 9 +++---- components/rendering/src/markdown.rs | 2 +- components/rendering/src/table_of_contents.rs | 26 +++++-------------- components/site/src/lib.rs | 21 ++++++++++++--- components/site/tests/site.rs | 7 +++-- components/templates/src/global_fns/mod.rs | 24 ++++++++++------- docs/content/documentation/content/page.md | 2 +- .../getting-started/cli-usage.md | 6 +++++ src/cli.rs | 14 ++++++++++ src/cmd/build.rs | 10 ++++++- src/cmd/check.rs | 10 ++++++- src/cmd/init.rs | 18 ++++++------- src/cmd/serve.rs | 24 +++++++++++++---- src/main.rs | 20 ++++++++++++-- 20 files changed, 141 insertions(+), 72 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f49dceb..4390114 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Breaking -- Pages with draft=true are now only loaded/rendered in `zola serve` +- Add `--drafts` flag to `build`, `serve` and `check` to load drafts. Drafts are never loaded by default anymore ### Other - Add `--open` flag to open server URL in default browser @@ -17,7 +17,7 @@ - Taxonomies can now have the same name in multiple languages - `zola init` can now be create sites inside the current directory - Fix table of contents generation for deep heading levels -- Add `lang` in all templates context except sitemap, robots etc +- Add `lang` in all templates context except sitemap, robots - Add `lang` parameter to `get_taxonomy` and `get_taxonomy_url` - Rebuild whole site on changes in `themes` changes - Add one-dark syntax highlighting theme diff --git a/Cargo.lock b/Cargo.lock index b1da8eb..dee5ad5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -249,7 +249,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "html5ever 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1334,7 +1334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "maplit" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1748,7 +1748,7 @@ name = "pest_meta" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3375,7 +3375,7 @@ dependencies = [ "checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" "checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -"checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43" +"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" "checksum markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03" "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" diff --git a/components/config/src/config.rs b/components/config/src/config.rs index 44cbc11..0a1e1e2 100644 --- a/components/config/src/config.rs +++ b/components/config/src/config.rs @@ -13,7 +13,7 @@ use theme::Theme; use utils::fs::read_file_with_error; // We want a default base url for tests -static DEFAULT_BASE_URL: &'static str = "http://a-website.com"; +static DEFAULT_BASE_URL: &str = "http://a-website.com"; #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] pub enum Mode { diff --git a/components/front_matter/src/page.rs b/components/front_matter/src/page.rs index 74f8299..3d70ff1 100644 --- a/components/front_matter/src/page.rs +++ b/components/front_matter/src/page.rs @@ -24,7 +24,7 @@ pub struct PageFrontMatter { /// The converted date into a (year, month, day) tuple #[serde(default, skip_deserializing)] pub datetime_tuple: Option<(i32, u32, u32)>, - /// Whether this page is a draft and should be ignored for pagination etc + /// Whether this page is a draft pub draft: bool, /// The page slug. Will be used instead of the filename if present /// Can't be an empty string if present diff --git a/components/front_matter/src/section.rs b/components/front_matter/src/section.rs index db8ca8f..ffbcaf2 100644 --- a/components/front_matter/src/section.rs +++ b/components/front_matter/src/section.rs @@ -7,7 +7,7 @@ use errors::Result; use super::{InsertAnchor, SortBy}; -static DEFAULT_PAGINATE_PATH: &'static str = "page"; +static DEFAULT_PAGINATE_PATH: &str = "page"; /// The front matter of every section #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] diff --git a/components/imageproc/src/lib.rs b/components/imageproc/src/lib.rs index 4708e96..b1f5827 100644 --- a/components/imageproc/src/lib.rs +++ b/components/imageproc/src/lib.rs @@ -23,7 +23,7 @@ use regex::Regex; use errors::{Error, Result}; use utils::fs as ufs; -static RESIZED_SUBDIR: &'static str = "processed_images"; +static RESIZED_SUBDIR: &str = "processed_images"; lazy_static! { pub static ref RESIZED_FILENAME: Regex = diff --git a/components/library/src/pagination/mod.rs b/components/library/src/pagination/mod.rs index f79dad3..d6091c4 100644 --- a/components/library/src/pagination/mod.rs +++ b/components/library/src/pagination/mod.rs @@ -117,9 +117,6 @@ impl<'a> Paginator<'a> { for key in self.all_pages { let page = library.get_page_by_key(*key); - if page.is_draft() { - continue; - } current_page.push(page.to_serialized_basic(library)); if current_page.len() == self.paginate_by { @@ -283,7 +280,7 @@ mod tests { assert_eq!(paginator.pagers[0].path, "posts/"); assert_eq!(paginator.pagers[1].index, 2); - assert_eq!(paginator.pagers[1].pages.len(), 1); + assert_eq!(paginator.pagers[1].pages.len(), 2); assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/posts/page/2/"); assert_eq!(paginator.pagers[1].path, "posts/page/2/"); } @@ -300,7 +297,7 @@ mod tests { assert_eq!(paginator.pagers[0].path, ""); assert_eq!(paginator.pagers[1].index, 2); - assert_eq!(paginator.pagers[1].pages.len(), 1); + assert_eq!(paginator.pagers[1].pages.len(), 2); assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/page/2/"); assert_eq!(paginator.pagers[1].path, "page/2/"); } @@ -352,7 +349,7 @@ mod tests { assert_eq!(paginator.pagers[0].path, "tags/something"); assert_eq!(paginator.pagers[1].index, 2); - assert_eq!(paginator.pagers[1].pages.len(), 1); + assert_eq!(paginator.pagers[1].pages.len(), 2); assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/tags/something/page/2/"); assert_eq!(paginator.pagers[1].path, "tags/something/page/2/"); } diff --git a/components/rendering/src/markdown.rs b/components/rendering/src/markdown.rs index 9325c5c..5d90373 100644 --- a/components/rendering/src/markdown.rs +++ b/components/rendering/src/markdown.rs @@ -317,7 +317,7 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result, header: &Header) -> match potential_parent { None => { // No potential parent to insert into so it needs to be insert higher - return false; - }, + false + } Some(parent) => { let diff = header.level - parent.level; if diff <= 0 { // Heading is same level or higher so we don't insert here return false; - } + } if diff == 1 { // We have a direct child of the parent parent.children.push(header.clone()); @@ -51,7 +51,7 @@ fn insert_into_parent(potential_parent: Option<&mut Header>, header: &Header) -> // No, we need to insert it here parent.children.push(header.clone()); } - return true; + true } } } @@ -61,23 +61,9 @@ fn insert_into_parent(potential_parent: Option<&mut Header>, header: &Header) -> pub fn make_table_of_contents(headers: Vec
) -> Vec
{ let mut toc = vec![]; for header in headers { - if toc.is_empty() { - // First header, nothing to compare it with + // First header or we try to insert the current header in a previous one + if toc.is_empty() || !insert_into_parent(toc.iter_mut().last(), &header) { toc.push(header); - continue; - } - - // We try to insert the current header in a previous one - match insert_into_parent(toc.iter_mut().last(), &header) { - true => { - // Header was successfully inserted as a child of a previous element - continue; - }, - false => { - // Couldn't insert in a previous header, so it's a top-level header - toc.push(header); - continue; - } } } diff --git a/components/site/src/lib.rs b/components/site/src/lib.rs index c7a0bf4..d1f1d06 100644 --- a/components/site/src/lib.rs +++ b/components/site/src/lib.rs @@ -63,6 +63,8 @@ pub struct Site { pub permalinks: HashMap, /// Contains all pages and sections of the site pub library: Arc>, + /// Whether to load draft pages + include_drafts: bool, } impl Site { @@ -131,6 +133,7 @@ impl Site { static_path, taxonomies: Vec::new(), permalinks: HashMap::new(), + include_drafts: false, // We will allocate it properly later on library: Arc::new(RwLock::new(Library::new(0, 0, false))), }; @@ -138,6 +141,12 @@ impl Site { Ok(site) } + /// Set the site to load the drafts. + /// Needs to be called before loading it + pub fn include_drafts(&mut self) { + self.include_drafts = true; + } + /// The index sections are ALWAYS at those paths /// There are one index section for the basic language + 1 per language fn index_section_paths(&self) -> Vec<(PathBuf, Option)> { @@ -233,8 +242,8 @@ impl Site { let mut pages_insert_anchors = HashMap::new(); for page in pages { let p = page?; - // Draft pages are not rendered in zola build so we just discard them - if p.meta.draft && !self.config.is_in_serve_mode() { + // Should draft pages be ignored? + if p.meta.draft && !self.include_drafts { continue; } pages_insert_anchors.insert( @@ -525,7 +534,7 @@ impl Site { self.tera.register_function("trans", global_fns::Trans::new(self.config.clone())); self.tera.register_function( "get_taxonomy_url", - global_fns::GetTaxonomyUrl::new(&self.config.default_language,&self.taxonomies), + global_fns::GetTaxonomyUrl::new(&self.config.default_language, &self.taxonomies), ); } @@ -540,7 +549,11 @@ impl Site { ); self.tera.register_function( "get_taxonomy", - global_fns::GetTaxonomy::new(&self.config.default_language, self.taxonomies.clone(), self.library.clone()), + global_fns::GetTaxonomy::new( + &self.config.default_language, + self.taxonomies.clone(), + self.library.clone(), + ), ); } diff --git a/components/site/tests/site.rs b/components/site/tests/site.rs index 015f6ca..7fac192 100644 --- a/components/site/tests/site.rs +++ b/components/site/tests/site.rs @@ -189,9 +189,10 @@ fn can_build_site_without_live_reload() { } #[test] -fn can_build_site_with_live_reload() { +fn can_build_site_with_live_reload_and_drafts() { let (_, _tmp_dir, public) = build_site_with_setup("test_site", |mut site| { site.enable_live_reload(1000); + site.include_drafts(); (site, true) }); @@ -230,7 +231,9 @@ fn can_build_site_with_live_reload() { r#""# )); - assert_eq!(file_exists!(public, "posts/draft/index.html"), false); + // Drafts are included + assert!(file_exists!(public, "posts/draft/index.html")); + assert!(file_contains!(public, "sitemap.xml", "draft")); } #[test] diff --git a/components/templates/src/global_fns/mod.rs b/components/templates/src/global_fns/mod.rs index c84b6da..a57126b 100644 --- a/components/templates/src/global_fns/mod.rs +++ b/components/templates/src/global_fns/mod.rs @@ -94,8 +94,8 @@ impl ResizeImage { } } -static DEFAULT_OP: &'static str = "fill"; -static DEFAULT_FMT: &'static str = "auto"; +static DEFAULT_OP: &str = "fill"; +static DEFAULT_FMT: &str = "auto"; const DEFAULT_Q: u8 = 75; impl TeraFn for ResizeImage { @@ -203,8 +203,9 @@ impl TeraFn for GetTaxonomyUrl { args.get("name"), "`get_taxonomy_url` requires a `name` argument with a string value" ); - let lang = optional_arg!(String, args.get("lang"), "`get_taxonomy`: `lang` must be a string") - .unwrap_or_else(|| self.default_lang.clone()); + let lang = + optional_arg!(String, args.get("lang"), "`get_taxonomy`: `lang` must be a string") + .unwrap_or_else(|| self.default_lang.clone()); let container = match self.taxonomies.get(&format!("{}-{}", kind, lang)) { Some(c) => c, @@ -296,7 +297,11 @@ pub struct GetTaxonomy { default_lang: String, } impl GetTaxonomy { - pub fn new(default_lang: &str, all_taxonomies: Vec, library: Arc>) -> Self { + pub fn new( + default_lang: &str, + all_taxonomies: Vec, + library: Arc>, + ) -> Self { let mut taxonomies = HashMap::new(); for taxo in all_taxonomies { taxonomies.insert(format!("{}-{}", taxo.kind.name, taxo.kind.lang), taxo); @@ -312,8 +317,9 @@ impl TeraFn for GetTaxonomy { "`get_taxonomy` requires a `kind` argument with a string value" ); - let lang = optional_arg!(String, args.get("lang"), "`get_taxonomy`: `lang` must be a string") - .unwrap_or_else(|| self.default_lang.clone()); + let lang = + optional_arg!(String, args.get("lang"), "`get_taxonomy`: `lang` must be a string") + .unwrap_or_else(|| self.default_lang.clone()); match self.taxonomies.get(&format!("{}-{}", kind, lang)) { Some(t) => Ok(to_value(t.to_serialized(&self.library.read().unwrap())).unwrap()), @@ -408,8 +414,8 @@ mod tests { let tags_fr = Taxonomy { kind: taxo_config_fr, items: vec![tag_fr] }; let taxonomies = vec![tags.clone(), tags_fr.clone()]; - let static_fn = GetTaxonomy::new(&config.default_language, taxonomies.clone(), library.clone()) - ; + let static_fn = + GetTaxonomy::new(&config.default_language, taxonomies.clone(), library.clone()); // can find it correctly let mut args = HashMap::new(); args.insert("kind".to_string(), to_value("tags").unwrap()); diff --git a/docs/content/documentation/content/page.md b/docs/content/documentation/content/page.md index 87a4a19..6512468 100644 --- a/docs/content/documentation/content/page.md +++ b/docs/content/documentation/content/page.md @@ -55,7 +55,7 @@ date = # will not be rendered. weight = 0 -# A draft page is only rendered in `zola serve`, they are ignored in `zola build` and `zola check` +# A draft page is only loaded if the `--drafts` flag is passed to `zola build`, `zola serve` or `zola check` draft = false # If filled, it will use that slug instead of the filename to make up the URL diff --git a/docs/content/documentation/getting-started/cli-usage.md b/docs/content/documentation/getting-started/cli-usage.md index c63c9ba..d31a198 100644 --- a/docs/content/documentation/getting-started/cli-usage.md +++ b/docs/content/documentation/getting-started/cli-usage.md @@ -56,6 +56,8 @@ You can also point to another config file than `config.toml` like so - the posit $ zola --config config.staging.toml build ``` +By defaults, drafts are not loaded. If you wish to include them, pass the `--drafts` flag. + ## serve This will build and serve the site using a local server. You can also specify @@ -95,12 +97,16 @@ You can also point to another config file than `config.toml` like so - the posit $ zola --config config.staging.toml serve ``` +By defaults, drafts are not loaded. If you wish to include them, pass the `--drafts` flag. + ### check The check subcommand will try to build all pages just like the build command would, but without writing any of the results to disk. Additionally, it will also check all external links present in Markdown files by trying to fetch them (links present in the template files will not be checked). +By defaults, drafts are not loaded. If you wish to include them, pass the `--drafts` flag. + ## Colored output Any of the three commands will emit colored output if your terminal supports it. diff --git a/src/cli.rs b/src/cli.rs index 8951840..0598e75 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -36,6 +36,10 @@ pub fn build_cli() -> App<'static, 'static> { .default_value("public") .takes_value(true) .help("Outputs the generated site in the given path"), + Arg::with_name("drafts") + .long("drafts") + .takes_value(false) + .help("Include drafts when loading the site"), ]), SubCommand::with_name("serve") .about("Serve the site. Rebuild and reload on change automatically") @@ -66,6 +70,10 @@ pub fn build_cli() -> App<'static, 'static> { .long("watch-only") .takes_value(false) .help("Do not start a server, just re-build project on changes"), + Arg::with_name("drafts") + .long("drafts") + .takes_value(false) + .help("Include drafts when loading the site"), Arg::with_name("open") .short("O") .long("open") @@ -74,5 +82,11 @@ pub fn build_cli() -> App<'static, 'static> { ]), SubCommand::with_name("check") .about("Try building the project without rendering it. Checks links") + .args(&[ + Arg::with_name("drafts") + .long("drafts") + .takes_value(false) + .help("Include drafts when loading the site"), + ]) ]) } diff --git a/src/cmd/build.rs b/src/cmd/build.rs index aca974e..7ac1edc 100644 --- a/src/cmd/build.rs +++ b/src/cmd/build.rs @@ -5,12 +5,20 @@ use site::Site; use console; -pub fn build(config_file: &str, base_url: Option<&str>, output_dir: &str) -> Result<()> { +pub fn build( + config_file: &str, + base_url: Option<&str>, + output_dir: &str, + include_drafts: bool, +) -> Result<()> { let mut site = Site::new(env::current_dir().unwrap(), config_file)?; site.set_output_path(output_dir); if let Some(b) = base_url { site.set_base_url(b.to_string()); } + if include_drafts { + site.include_drafts(); + } site.load()?; console::notify_site_size(&site); console::warn_about_ignored_pages(&site); diff --git a/src/cmd/check.rs b/src/cmd/check.rs index c2991ac..29fba3a 100644 --- a/src/cmd/check.rs +++ b/src/cmd/check.rs @@ -6,7 +6,12 @@ use site::Site; use console; -pub fn check(config_file: &str, base_path: Option<&str>, base_url: Option<&str>) -> Result<()> { +pub fn check( + config_file: &str, + base_path: Option<&str>, + base_url: Option<&str>, + include_drafts: bool, +) -> Result<()> { let bp = base_path.map(PathBuf::from).unwrap_or_else(|| env::current_dir().unwrap()); let mut site = Site::new(bp, config_file)?; // Force the checking of external links @@ -14,6 +19,9 @@ pub fn check(config_file: &str, base_path: Option<&str>, base_url: Option<&str>) if let Some(b) = base_url { site.set_base_url(b.to_string()); } + if include_drafts { + site.include_drafts(); + } site.load()?; console::check_site_summary(&site); console::warn_about_ignored_pages(&site); diff --git a/src/cmd/init.rs b/src/cmd/init.rs index 88233ff..92c0556 100644 --- a/src/cmd/init.rs +++ b/src/cmd/init.rs @@ -59,16 +59,14 @@ pub fn is_directory_quasi_empty(path: &Path) -> Result { pub fn create_new_project(name: &str) -> Result<()> { let path = Path::new(name); // Better error message than the rust default - if path.exists() { - if !is_directory_quasi_empty(&path)? { - if name == "." { - bail!("The current directory is not an empty folder (hidden files are ignored)."); - } else { - bail!( - "`{}` is not an empty folder (hidden files are ignored).", - path.to_string_lossy().to_string() - ) - } + if path.exists() && !is_directory_quasi_empty(&path)? { + if name == "." { + bail!("The current directory is not an empty folder (hidden files are ignored)."); + } else { + bail!( + "`{}` is not an empty folder (hidden files are ignored).", + path.to_string_lossy().to_string() + ) } } diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs index 080eaf2..32ccae9 100644 --- a/src/cmd/serve.rs +++ b/src/cmd/serve.rs @@ -118,6 +118,7 @@ fn create_new_site( output_dir: &str, base_url: &str, config_file: &str, + include_drafts: bool, ) -> Result<(Site, String)> { let mut site = Site::new(env::current_dir().unwrap(), config_file)?; @@ -132,6 +133,9 @@ fn create_new_site( site.config.enable_serve_mode(); site.set_base_url(base_url); site.set_output_path(output_dir); + if include_drafts { + site.include_drafts(); + } site.load()?; site.enable_live_reload(port); console::notify_site_size(&site); @@ -148,9 +152,11 @@ pub fn serve( config_file: &str, watch_only: bool, open: bool, + include_drafts: bool, ) -> Result<()> { let start = Instant::now(); - let (mut site, address) = create_new_site(interface, port, output_dir, base_url, config_file)?; + let (mut site, address) = + create_new_site(interface, port, output_dir, base_url, config_file, include_drafts)?; console::report_elapsed_time(start); // Setup watchers @@ -375,18 +381,21 @@ pub fn serve( ChangeKind::StaticFiles => copy_static(&site, &path, &partial_path), ChangeKind::Sass => reload_sass(&site, &path, &partial_path), ChangeKind::Themes => { - console::info("-> Themes changed. The whole site will be reloaded."); + console::info( + "-> Themes changed. The whole site will be reloaded.", + ); site = create_new_site( interface, port, output_dir, base_url, config_file, + include_drafts, ) .unwrap() .0; rebuild_done_handling(&broadcaster, Ok(()), "/x.js"); - }, + } ChangeKind::Config => { console::info("-> Config changed. The whole site will be reloaded. The browser needs to be refreshed to make the changes visible."); site = create_new_site( @@ -395,6 +404,7 @@ pub fn serve( output_dir, base_url, config_file, + include_drafts, ) .unwrap() .0; @@ -432,18 +442,21 @@ pub fn serve( (ChangeKind::StaticFiles, p) => copy_static(&site, &path, &p), (ChangeKind::Sass, p) => reload_sass(&site, &path, &p), (ChangeKind::Themes, _) => { - console::info("-> Themes changed. The whole site will be reloaded."); + console::info( + "-> Themes changed. The whole site will be reloaded.", + ); site = create_new_site( interface, port, output_dir, base_url, config_file, + include_drafts, ) .unwrap() .0; rebuild_done_handling(&broadcaster, Ok(()), "/x.js"); - }, + } (ChangeKind::Config, _) => { console::info("-> Config changed. The whole site will be reloaded. The browser needs to be refreshed to make the changes visible."); site = create_new_site( @@ -452,6 +465,7 @@ pub fn serve( output_dir, base_url, config_file, + include_drafts, ) .unwrap() .0; diff --git a/src/main.rs b/src/main.rs index 1af99df..4383853 100644 --- a/src/main.rs +++ b/src/main.rs @@ -48,7 +48,12 @@ fn main() { console::info("Building site..."); let start = Instant::now(); let output_dir = matches.value_of("output_dir").unwrap(); - match cmd::build(config_file, matches.value_of("base_url"), output_dir) { + match cmd::build( + config_file, + matches.value_of("base_url"), + output_dir, + matches.is_present("drafts"), + ) { Ok(()) => console::report_elapsed_time(start), Err(e) => { console::unravel_errors("Failed to build the site", &e); @@ -67,6 +72,7 @@ fn main() { }; let watch_only = matches.is_present("watch_only"); let open = matches.is_present("open"); + let include_drafts = matches.is_present("drafts"); // Default one if port != 1111 && !watch_only && !port_is_available(port) { @@ -85,7 +91,16 @@ fn main() { let output_dir = matches.value_of("output_dir").unwrap(); let base_url = matches.value_of("base_url").unwrap(); console::info("Building site..."); - match cmd::serve(interface, port, output_dir, base_url, config_file, watch_only, open) { + match cmd::serve( + interface, + port, + output_dir, + base_url, + config_file, + watch_only, + open, + include_drafts, + ) { Ok(()) => (), Err(e) => { console::unravel_errors("", &e); @@ -100,6 +115,7 @@ fn main() { config_file, matches.value_of("base_path"), matches.value_of("base_url"), + matches.is_present("drafts"), ) { Ok(()) => console::report_elapsed_time(start), Err(e) => { From fb938a3eed473218e5a4fa96ac5b50b699a30045 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sun, 25 Aug 2019 19:15:12 +0200 Subject: [PATCH 55/67] Update completions --- completions/_zola | 7 ++++++- completions/_zola.ps1 | 5 +++++ completions/zola.bash | 6 +++--- completions/zola.fish | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/completions/_zola b/completions/_zola index b92cc47..3ca5a4d 100644 --- a/completions/_zola +++ b/completions/_zola @@ -36,7 +36,7 @@ _arguments "${_arguments_options[@]}" \ '--help[Prints help information]' \ '-V[Prints version information]' \ '--version[Prints version information]' \ -':name -- Name of the project. Will create a new directory with that name in the current directory:_files' \ +'::name -- Name of the project. Will create a new directory with that name in the current directory:_files' \ && ret=0 ;; (build) @@ -45,6 +45,7 @@ _arguments "${_arguments_options[@]}" \ '--base-url=[Force the base URL to be that value (default to the one in config.toml)]' \ '-o+[Outputs the generated site in the given path]' \ '--output-dir=[Outputs the generated site in the given path]' \ +'--drafts[Include drafts when loading the site]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ @@ -62,6 +63,9 @@ _arguments "${_arguments_options[@]}" \ '-u+[Changes the base_url]' \ '--base-url=[Changes the base_url]' \ '--watch-only[Do not start a server, just re-build project on changes]' \ +'--drafts[Include drafts when loading the site]' \ +'-O[Open site in the default browser]' \ +'--open[Open site in the default browser]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ @@ -70,6 +74,7 @@ _arguments "${_arguments_options[@]}" \ ;; (check) _arguments "${_arguments_options[@]}" \ +'--drafts[Include drafts when loading the site]' \ '-h[Prints help information]' \ '--help[Prints help information]' \ '-V[Prints version information]' \ diff --git a/completions/_zola.ps1 b/completions/_zola.ps1 index e10fb9d..89915d9 100644 --- a/completions/_zola.ps1 +++ b/completions/_zola.ps1 @@ -45,6 +45,7 @@ Register-ArgumentCompleter -Native -CommandName 'zola' -ScriptBlock { [CompletionResult]::new('--base-url', 'base-url', [CompletionResultType]::ParameterName, 'Force the base URL to be that value (default to the one in config.toml)') [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Outputs the generated site in the given path') [CompletionResult]::new('--output-dir', 'output-dir', [CompletionResultType]::ParameterName, 'Outputs the generated site in the given path') + [CompletionResult]::new('--drafts', 'drafts', [CompletionResultType]::ParameterName, 'Include drafts when loading the site') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information') @@ -61,6 +62,9 @@ Register-ArgumentCompleter -Native -CommandName 'zola' -ScriptBlock { [CompletionResult]::new('-u', 'u', [CompletionResultType]::ParameterName, 'Changes the base_url') [CompletionResult]::new('--base-url', 'base-url', [CompletionResultType]::ParameterName, 'Changes the base_url') [CompletionResult]::new('--watch-only', 'watch-only', [CompletionResultType]::ParameterName, 'Do not start a server, just re-build project on changes') + [CompletionResult]::new('--drafts', 'drafts', [CompletionResultType]::ParameterName, 'Include drafts when loading the site') + [CompletionResult]::new('-O', 'O', [CompletionResultType]::ParameterName, 'Open site in the default browser') + [CompletionResult]::new('--open', 'open', [CompletionResultType]::ParameterName, 'Open site in the default browser') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information') @@ -68,6 +72,7 @@ Register-ArgumentCompleter -Native -CommandName 'zola' -ScriptBlock { break } 'zola;check' { + [CompletionResult]::new('--drafts', 'drafts', [CompletionResultType]::ParameterName, 'Include drafts when loading the site') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information') diff --git a/completions/zola.bash b/completions/zola.bash index bc3ea24..dcaa073 100644 --- a/completions/zola.bash +++ b/completions/zola.bash @@ -59,7 +59,7 @@ _zola() { ;; zola__build) - opts=" -h -V -u -o --help --version --base-url --output-dir " + opts=" -h -V -u -o --drafts --help --version --base-url --output-dir " if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 @@ -90,7 +90,7 @@ _zola() { return 0 ;; zola__check) - opts=" -h -V --help --version " + opts=" -h -V --drafts --help --version " if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 @@ -135,7 +135,7 @@ _zola() { return 0 ;; zola__serve) - opts=" -h -V -i -p -o -u --watch-only --help --version --interface --port --output-dir --base-url " + opts=" -O -h -V -i -p -o -u --watch-only --drafts --open --help --version --interface --port --output-dir --base-url " if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) return 0 diff --git a/completions/zola.fish b/completions/zola.fish index 5e8316f..cb3302e 100644 --- a/completions/zola.fish +++ b/completions/zola.fish @@ -10,6 +10,7 @@ complete -c zola -n "__fish_seen_subcommand_from init" -s h -l help -d 'Prints h complete -c zola -n "__fish_seen_subcommand_from init" -s V -l version -d 'Prints version information' complete -c zola -n "__fish_seen_subcommand_from build" -s u -l base-url -d 'Force the base URL to be that value (default to the one in config.toml)' complete -c zola -n "__fish_seen_subcommand_from build" -s o -l output-dir -d 'Outputs the generated site in the given path' +complete -c zola -n "__fish_seen_subcommand_from build" -l drafts -d 'Include drafts when loading the site' complete -c zola -n "__fish_seen_subcommand_from build" -s h -l help -d 'Prints help information' complete -c zola -n "__fish_seen_subcommand_from build" -s V -l version -d 'Prints version information' complete -c zola -n "__fish_seen_subcommand_from serve" -s i -l interface -d 'Interface to bind on' @@ -17,8 +18,11 @@ complete -c zola -n "__fish_seen_subcommand_from serve" -s p -l port -d 'Which p complete -c zola -n "__fish_seen_subcommand_from serve" -s o -l output-dir -d 'Outputs the generated site in the given path' complete -c zola -n "__fish_seen_subcommand_from serve" -s u -l base-url -d 'Changes the base_url' complete -c zola -n "__fish_seen_subcommand_from serve" -l watch-only -d 'Do not start a server, just re-build project on changes' +complete -c zola -n "__fish_seen_subcommand_from serve" -l drafts -d 'Include drafts when loading the site' +complete -c zola -n "__fish_seen_subcommand_from serve" -s O -l open -d 'Open site in the default browser' complete -c zola -n "__fish_seen_subcommand_from serve" -s h -l help -d 'Prints help information' complete -c zola -n "__fish_seen_subcommand_from serve" -s V -l version -d 'Prints version information' +complete -c zola -n "__fish_seen_subcommand_from check" -l drafts -d 'Include drafts when loading the site' complete -c zola -n "__fish_seen_subcommand_from check" -s h -l help -d 'Prints help information' complete -c zola -n "__fish_seen_subcommand_from check" -s V -l version -d 'Prints version information' complete -c zola -n "__fish_seen_subcommand_from help" -s h -l help -d 'Prints help information' From fb89f945162705acbc8c05eeab3689f6bb0b3c17 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Thu, 29 Aug 2019 20:08:02 +0200 Subject: [PATCH 56/67] Process images on rebuild Closes #790 --- CHANGELOG.md | 1 + Cargo.lock | 279 +++++++----------- components/rebuild/src/lib.rs | 5 + docs/content/documentation/content/page.md | 6 +- docs/content/documentation/content/section.md | 6 +- docs/templates/shortcodes/gallery.html | 1 - 6 files changed, 115 insertions(+), 183 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4390114..bf53885 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Add `lang` parameter to `get_taxonomy` and `get_taxonomy_url` - Rebuild whole site on changes in `themes` changes - Add one-dark syntax highlighting theme +- Process images on changes in `zola serve` if needed after change ## 0.8.0 (2019-06-22) diff --git a/Cargo.lock b/Cargo.lock index dee5ad5..ea3f288 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -36,8 +36,8 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -57,7 +57,7 @@ dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-connect 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -75,7 +75,7 @@ dependencies = [ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -127,7 +127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -153,7 +153,7 @@ dependencies = [ [[package]] name = "actix-service" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", @@ -166,7 +166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -179,7 +179,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", @@ -190,7 +190,7 @@ dependencies = [ [[package]] name = "actix-web" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -199,7 +199,7 @@ dependencies = [ "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -215,9 +215,9 @@ dependencies = [ "regex 1.2.1 (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_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -248,7 +248,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "html5ever 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -260,7 +260,7 @@ name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -282,7 +282,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -306,7 +306,7 @@ name = "backtrace-sys" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -357,7 +357,7 @@ name = "bstr" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", @@ -388,13 +388,13 @@ name = "c2-chacha" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cc" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -448,7 +448,7 @@ dependencies = [ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (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)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -474,7 +474,7 @@ dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "publicsuffix 1.5.3 (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)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -543,7 +543,7 @@ dependencies = [ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -562,7 +562,7 @@ version = "0.6.6" 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)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -591,7 +591,7 @@ version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -608,7 +608,7 @@ name = "derive_more" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (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.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -644,7 +644,7 @@ name = "elasticlunr-rs" version = "2.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rust-stemmers 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", @@ -654,63 +654,6 @@ dependencies = [ "strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "encoding_rs" version = "0.8.17" @@ -818,7 +761,7 @@ version = "0.1.0" dependencies = [ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (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)", @@ -896,7 +839,7 @@ name = "generic-array" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -909,7 +852,7 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.10" +version = "0.1.11" 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)", @@ -1111,7 +1054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1128,7 +1071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "jpeg-decoder 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1144,7 +1087,7 @@ version = "0.1.0" dependencies = [ "errors 0.1.0", "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1198,7 +1141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1209,7 +1152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "jpeg-decoder" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1232,7 +1175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lazy_static" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1254,7 +1197,7 @@ dependencies = [ "errors 0.1.0", "front_matter 0.1.0", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rendering 0.1.0", @@ -1280,7 +1223,7 @@ dependencies = [ name = "link_checker" version = "0.1.0" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1396,7 +1339,7 @@ name = "miniz-sys" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1462,7 +1405,7 @@ name = "native-tls" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (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)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1481,7 +1424,7 @@ 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)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1495,7 +1438,7 @@ version = "0.14.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)", - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (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)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1530,7 +1473,7 @@ dependencies = [ "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1594,7 +1537,7 @@ version = "4.3.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)", - "lazy_static 1.3.0 (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)", "onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1604,7 +1547,7 @@ name = "onig_sys" version = "69.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1618,7 +1561,7 @@ name = "open" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1629,7 +1572,7 @@ dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (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)", "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1645,7 +1588,7 @@ version = "0.9.49" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (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)", @@ -1687,7 +1630,7 @@ dependencies = [ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1701,7 +1644,7 @@ dependencies = [ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1844,14 +1787,14 @@ dependencies = [ [[package]] name = "publicsuffix" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1901,7 +1844,7 @@ dependencies = [ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1909,10 +1852,10 @@ name = "rand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1931,7 +1874,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1949,10 +1892,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rand_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1968,7 +1911,7 @@ name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1986,7 +1929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1999,7 +1942,7 @@ dependencies = [ "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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2037,7 +1980,7 @@ dependencies = [ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2095,7 +2038,7 @@ name = "remove_dir_all" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2105,7 +2048,7 @@ dependencies = [ "config 0.1.0", "errors 0.1.0", "front_matter 0.1.0", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "link_checker 0.1.0", "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2216,7 +2159,7 @@ name = "sass-sys" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2227,8 +2170,8 @@ name = "schannel" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.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]] @@ -2253,7 +2196,7 @@ dependencies = [ "ammonia 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "elasticlunr-rs 2.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "library 0.1.0", ] @@ -2304,7 +2247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.1 (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.4 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2432,7 +2375,7 @@ 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_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2453,7 +2396,7 @@ name = "string_cache" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2512,7 +2455,7 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2540,7 +2483,7 @@ dependencies = [ "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)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (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 4.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "plist 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2562,7 +2505,7 @@ dependencies = [ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2575,7 +2518,7 @@ dependencies = [ "errors 0.1.0", "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", "imageproc 0.1.0", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "library 0.1.0", "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2604,7 +2547,7 @@ dependencies = [ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "globwalk 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2636,7 +2579,7 @@ name = "thread_local" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2665,7 +2608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.62 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2741,7 +2684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2765,7 +2708,7 @@ dependencies = [ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2819,7 +2762,7 @@ dependencies = [ [[package]] name = "tokio-udp" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2849,7 +2792,7 @@ dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2859,7 +2802,7 @@ dependencies = [ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-udp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2872,7 +2815,7 @@ dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2896,7 +2839,7 @@ dependencies = [ [[package]] name = "typenum" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2997,7 +2940,6 @@ name = "url" version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3093,7 +3035,7 @@ version = "2.2.9" 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)", - "winapi 0.3.7 (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)", ] @@ -3124,7 +3066,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3146,7 +3088,7 @@ name = "winapi-util" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3159,7 +3101,7 @@ name = "wincolor" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (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)", ] @@ -3168,7 +3110,7 @@ name = "winreg" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3176,7 +3118,7 @@ name = "winutil" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3223,7 +3165,7 @@ name = "zola" version = "0.9.0" dependencies = [ "actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3231,7 +3173,7 @@ dependencies = [ "errors 0.1.0", "front_matter 0.1.0", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rebuild 0.1.0", @@ -3251,10 +3193,10 @@ dependencies = [ "checksum actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "18d9054b1cfacfa441846b9b99001010cb8fbb02130e6cfdb25cea36d3e98e87" "checksum actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb3038e9e457e0a498ea682723e0f4e6cc2c4f362a1868d749808355275ad959" "checksum actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "483a34989c682d93142bacad6300375bb6ad8002d2e0bb249dbad86128b9ff30" -"checksum actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaecc01bbc595ebd7a563a7d4f8a607d0b964bb55273c6f362b0b02c26508cf2" +"checksum actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bca5b48e928841ff7e7dce1fdb5b0d4582f6b1b976e08f4bac3f640643e0773f" "checksum actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b5ae85d13da7e6fb86b1b7bc83185e0e3bd4cc5f421c887e1803796c034d35d" "checksum actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea501068a0173533704be321f149853f702d9e3c3ce9d57e7a96d94b1ab5aca" -"checksum actix-web 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0147b2fd52ced64145c8370af627f12f098222a1c6ba67d021e21cd0d806f574" +"checksum actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ced216f53d465f9d6478454b2b994d1fe91ec203ac9d056837cbe07e823cb83" "checksum actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe9e3cdec1e645b675f354766e0688c5705021c85ab3cf739be1c8999b91c76" "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" @@ -3276,7 +3218,7 @@ dependencies = [ "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -"checksum cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "b548a4ee81fccb95919d4e22cfea83c7693ebfd78f0495493178db20b3139da7" +"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" "checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" @@ -3304,13 +3246,6 @@ dependencies = [ "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" "checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" "checksum elasticlunr-rs 2.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f66a620976c38dbbbcd6355910432cef8b0911b3af86332029752379f0ff7924" -"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -"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 encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed" "checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d" "checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" @@ -3333,7 +3268,7 @@ dependencies = [ "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -"checksum getrandom 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6171a6cc63fbabbe27c2b5ee268e8b7fe5dc1eb0dd2dfad537c1dfed6f69117e" +"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872" "checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" @@ -3361,10 +3296,10 @@ dependencies = [ "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" "checksum ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa79fa216fbe60834a9c0737d7fcd30425b32d1c58854663e24d4c4b328ed83f" "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -"checksum jpeg-decoder 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "c8b7d43206b34b3f94ea9445174bda196e772049b9bddbc620c9d29b2d20110d" +"checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +"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 line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" @@ -3430,7 +3365,7 @@ dependencies = [ "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802" -"checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d" +"checksum publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9bf259a81de2b2eb9850ec990ec78e6a25319715584fd7652b9b26f96fcb1510" "checksum pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" @@ -3441,7 +3376,7 @@ dependencies = [ "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "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_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" +"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" @@ -3499,7 +3434,7 @@ dependencies = [ "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -"checksum syn 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c65d951ab12d976b61a41cf9ed4531fc19735c6e6d84a4bb1453711e762ec731" +"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 syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" @@ -3523,13 +3458,13 @@ dependencies = [ "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" "checksum tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19" "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" -"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" +"checksum tokio-udp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "56775b287cda0fd8ca0c5d2f5b1d0646afbd360101e2eef91cd89365fcfc2f5f" "checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724" "checksum trust-dns-proto 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5559ebdf6c2368ddd11e20b11d6bbaf9e46deb803acd7815e93f5a7b4a6d2901" "checksum trust-dns-resolver 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9992e58dba365798803c0b91018ff6c8d3fc77e06977c4539af2a6bfe0a039" "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" "checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" -"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" +"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 unic-char-property 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" "checksum unic-char-range 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" @@ -3560,7 +3495,7 @@ dependencies = [ "checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" +"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" diff --git a/components/rebuild/src/lib.rs b/components/rebuild/src/lib.rs index 93cf4e9..7e18034 100644 --- a/components/rebuild/src/lib.rs +++ b/components/rebuild/src/lib.rs @@ -137,6 +137,7 @@ fn handle_section_editing(site: &mut Site, path: &Path) -> Result<()> { // Updating a section Some(prev) => { site.populate_sections(); + site.process_images()?; { let library = site.library.read().unwrap(); @@ -177,6 +178,7 @@ fn handle_section_editing(site: &mut Site, path: &Path) -> Result<()> { // New section, only render that one None => { site.populate_sections(); + site.process_images()?; site.register_tera_global_fns(); site.render_section(&site.library.read().unwrap().get_section(&pathbuf).unwrap(), true) } @@ -201,6 +203,7 @@ fn handle_page_editing(site: &mut Site, path: &Path) -> Result<()> { site.populate_sections(); site.populate_taxonomies()?; site.register_tera_global_fns(); + site.process_images()?; { let library = site.library.read().unwrap(); @@ -249,6 +252,7 @@ fn handle_page_editing(site: &mut Site, path: &Path) -> Result<()> { site.populate_taxonomies()?; site.register_early_global_fns(); site.register_tera_global_fns(); + site.process_images()?; // No need to optimise that yet, we can revisit if it becomes an issue site.build() } @@ -406,6 +410,7 @@ pub fn after_template_change(site: &mut Site, path: &Path) -> Result<()> { site.populate_sections(); site.populate_taxonomies()?; site.render_sections()?; + site.process_images()?; site.render_orphan_pages()?; site.render_taxonomies() } diff --git a/docs/content/documentation/content/page.md b/docs/content/documentation/content/page.md index 6512468..505f0c0 100644 --- a/docs/content/documentation/content/page.md +++ b/docs/content/documentation/content/page.md @@ -37,8 +37,7 @@ While none of the front-matter variables are mandatory, the opening and closing Here is an example page with all the variables available. The values provided below are the default values. -```md -+++ +```toml title = "" description = "" @@ -87,9 +86,6 @@ template = "page.html" # Your own data [extra] -+++ - -Some content ``` ## Summary diff --git a/docs/content/documentation/content/section.md b/docs/content/documentation/content/section.md index b0cf13e..41e4a0e 100644 --- a/docs/content/documentation/content/section.md +++ b/docs/content/documentation/content/section.md @@ -33,8 +33,7 @@ Here is an example `_index.md` with all the variables available. The values pro default values. -```md -+++ +```toml title = "" description = "" @@ -95,9 +94,6 @@ aliases = [] # Your own data [extra] -+++ - -Some content ``` Keep in mind that any configuration apply only to the direct pages, not to the subsections' pages. diff --git a/docs/templates/shortcodes/gallery.html b/docs/templates/shortcodes/gallery.html index e50f823..91a75f4 100644 --- a/docs/templates/shortcodes/gallery.html +++ b/docs/templates/shortcodes/gallery.html @@ -3,6 +3,5 @@ -   {%- endif %} {%- endfor %} From e77adc56fdc74525a8d778a18153812f8cbba1b2 Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 30 Aug 2019 21:44:57 +0800 Subject: [PATCH 57/67] Fix the issue when checking the changes for multiple language section index file (#787) * Fix the issue when checking the changes of multiple language section --- components/rebuild/src/lib.rs | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/components/rebuild/src/lib.rs b/components/rebuild/src/lib.rs index 7e18034..02e6367 100644 --- a/components/rebuild/src/lib.rs +++ b/components/rebuild/src/lib.rs @@ -323,9 +323,28 @@ pub fn after_content_rename(site: &mut Site, old: &Path, new: &Path) -> Result<( Ok(()) } +fn is_section(path: &str, languages_codes: &[&str]) -> bool { + if path == "_index.md" { + return true; + } + + for language_code in languages_codes { + let lang_section_string = format!("_index.{}.md", language_code); + if path == lang_section_string { + return true; + } + } + + return false; +} + /// What happens when a section or a page is created/edited pub fn after_content_change(site: &mut Site, path: &Path) -> Result<()> { - let is_section = path.file_name().unwrap() == "_index.md"; + let is_section = { + let languages_codes = site.config.languages_codes(); + is_section(path.file_name().unwrap().to_str().unwrap(), &languages_codes) + }; + let is_md = path.extension().unwrap() == "md"; let index = path.parent().unwrap().join("index.md"); From 5aadd3d4f2b425b879f1d9e4524b11a049162c37 Mon Sep 17 00:00:00 2001 From: zdenek-crha <35028759+zdenek-crha@users.noreply.github.com> Date: Tue, 3 Sep 2019 10:51:41 +0200 Subject: [PATCH 58/67] Fix crash of trans() function called on absent translation key (#793) Add method get_translation(lang, key) into Config struct that retrieves translated term from parsed configuration or error when either desired language or key is missing. Use the new method in Trans struct implementing global Tera function trans(). Add unit test to cover both happy and error path for translation retrieval in both config and templates crate. --- components/config/src/config.rs | 55 ++++++++++++++++++---- components/templates/src/global_fns/mod.rs | 40 +++++++++++++--- 2 files changed, 80 insertions(+), 15 deletions(-) diff --git a/components/config/src/config.rs b/components/config/src/config.rs index 0a1e1e2..18dd2ec 100644 --- a/components/config/src/config.rs +++ b/components/config/src/config.rs @@ -8,6 +8,7 @@ use toml; use toml::Value as Toml; use errors::Result; +use errors::Error; use highlighting::THEME_SET; use theme::Theme; use utils::fs::read_file_with_error; @@ -83,6 +84,8 @@ impl Default for Taxonomy { } } +type TranslateTerm = HashMap; + #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(default)] pub struct Config { @@ -100,8 +103,12 @@ pub struct Config { pub default_language: String, /// The list of supported languages outside of the default one pub languages: Vec, + /// Languages list and translated strings - pub translations: HashMap, + /// + /// The `String` key of `HashMap` is a language name, the value should be toml crate `Table` + /// with String key representing term and value another `String` representing its translation. + pub translations: HashMap, /// Whether to highlight all code blocks found in markdown files. Defaults to false pub highlight_code: bool, @@ -299,6 +306,16 @@ impl Config { // and this operation can be expensive. self.highlight_code = false; } + + pub fn get_translation>(&self, lang: S, key: S) -> Result { + let terms = self.translations.get(lang.as_ref()).ok_or_else(|| { + Error::msg(format!("Translation for language '{}' is missing", lang.as_ref())) + })?; + + terms.get(key.as_ref()).ok_or_else(|| { + Error::msg(format!("Translation key '{}' for language '{}' is missing", key.as_ref(), lang.as_ref())) + }).map(|term| term.to_string()) + } } impl Default for Config { @@ -447,9 +464,7 @@ a_value = 10 assert_eq!(extra["a_value"].as_integer().unwrap(), 10); } - #[test] - fn can_use_language_configuration() { - let config = r#" + const CONFIG_TRANSLATION: &str = r#" base_url = "https://remplace-par-ton-url.fr" default_language = "fr" @@ -459,14 +474,38 @@ title = "Un titre" [translations.en] title = "A title" - "#; - let config = Config::parse(config); + #[test] + fn can_use_language_configuration() { + let config = Config::parse(CONFIG_TRANSLATION); assert!(config.is_ok()); let translations = config.unwrap().translations; - assert_eq!(translations["fr"]["title"].as_str().unwrap(), "Un titre"); - assert_eq!(translations["en"]["title"].as_str().unwrap(), "A title"); + assert_eq!(translations["fr"]["title"].as_str(), "Un titre"); + assert_eq!(translations["en"]["title"].as_str(), "A title"); + } + + #[test] + fn can_use_present_translation() { + let config = Config::parse(CONFIG_TRANSLATION).unwrap(); + assert_eq!(config.get_translation("fr", "title").unwrap(), "Un titre"); + assert_eq!(config.get_translation("en", "title").unwrap(), "A title"); + } + + #[test] + fn error_on_absent_translation_lang() { + let config = Config::parse(CONFIG_TRANSLATION).unwrap(); + let error = config.get_translation("absent", "key").unwrap_err(); + + assert_eq!("Translation for language 'absent' is missing", format!("{}", error)); + } + + #[test] + fn error_on_absent_translation_key() { + let config = Config::parse(CONFIG_TRANSLATION).unwrap(); + let error = config.get_translation("en", "absent").unwrap_err(); + + assert_eq!("Translation key 'absent' for language 'en' is missing", format!("{}", error)); } #[test] diff --git a/components/templates/src/global_fns/mod.rs b/components/templates/src/global_fns/mod.rs index a57126b..8ae7d07 100644 --- a/components/templates/src/global_fns/mod.rs +++ b/components/templates/src/global_fns/mod.rs @@ -33,8 +33,12 @@ impl TeraFn for Trans { let key = required_arg!(String, args.get("key"), "`trans` requires a `key` argument."); let lang = optional_arg!(String, args.get("lang"), "`trans`: `lang` must be a string.") .unwrap_or_else(|| self.config.default_language.clone()); - let translations = &self.config.translations[lang.as_str()]; - Ok(to_value(&translations[key.as_str()]).unwrap()) + + let term = self.config.get_translation(lang, key).map_err(|e| { + Error::chain("Failed to retreive term translation", e) + })?; + + Ok(to_value(term).unwrap()) } } @@ -505,9 +509,8 @@ mod tests { assert!(static_fn.call(&args).is_err()); } - #[test] - fn can_translate_a_string() { - let trans_config = r#" + + const TRANS_CONFIG: &str = r#" base_url = "https://remplace-par-ton-url.fr" default_language = "fr" @@ -517,10 +520,11 @@ title = "Un titre" [translations.en] title = "A title" - "#; - let config = Config::parse(trans_config).unwrap(); + #[test] + fn can_translate_a_string() { + let config = Config::parse(TRANS_CONFIG).unwrap(); let static_fn = Trans::new(config); let mut args = HashMap::new(); @@ -533,4 +537,26 @@ title = "A title" args.insert("lang".to_string(), to_value("fr").unwrap()); assert_eq!(static_fn.call(&args).unwrap(), "Un titre"); } + + #[test] + fn error_on_absent_translation_lang() { + let mut args = HashMap::new(); + args.insert("lang".to_string(), to_value("absent").unwrap()); + args.insert("key".to_string(), to_value("title").unwrap()); + + let config = Config::parse(TRANS_CONFIG).unwrap(); + let error = Trans::new(config).call(&args).unwrap_err(); + assert_eq!("Failed to retreive term translation", format!("{}", error)); + } + + #[test] + fn error_on_absent_translation_key() { + let mut args = HashMap::new(); + args.insert("lang".to_string(), to_value("en").unwrap()); + args.insert("key".to_string(), to_value("absent").unwrap()); + + let config = Config::parse(TRANS_CONFIG).unwrap(); + let error = Trans::new(config).call(&args).unwrap_err(); + assert_eq!("Failed to retreive term translation", format!("{}", error)); + } } From 9db9fc8fb2d53c5d6eb762a5672a57b3f836d7bf Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 3 Sep 2019 22:50:23 +0800 Subject: [PATCH 59/67] Fix the issue of generating the search index for multiple language (#794) * fix the issue of generating the search index for multiple language * updat docs for generating the search index for multiple language * fix failed tests * add tests for the search index of multiple language --- components/config/src/config.rs | 4 +++- components/library/src/content/file_info.rs | 8 ++++---- components/library/src/content/page.rs | 6 +++--- components/library/src/content/section.rs | 6 +++--- components/library/src/taxonomies/mod.rs | 2 +- components/search/src/lib.rs | 4 +++- components/site/src/lib.rs | 12 ++++++++++++ components/site/tests/site_i18n.rs | 5 +++++ docs/content/documentation/content/multilingual.md | 1 + .../documentation/getting-started/configuration.md | 1 + test_site_i18n/config.toml | 6 ++++-- 11 files changed, 40 insertions(+), 15 deletions(-) diff --git a/components/config/src/config.rs b/components/config/src/config.rs index 18dd2ec..4f3dab5 100644 --- a/components/config/src/config.rs +++ b/components/config/src/config.rs @@ -30,11 +30,13 @@ pub struct Language { pub code: String, /// Whether to generate a RSS feed for that language, defaults to `false` pub rss: bool, + /// Whether to generate search index for that language, defaults to `false` + pub search: bool, } impl Default for Language { fn default() -> Language { - Language { code: String::new(), rss: false } + Language { code: String::new(), rss: false, search: false } } } diff --git a/components/library/src/content/file_info.rs b/components/library/src/content/file_info.rs index 32ed484..0fe0686 100644 --- a/components/library/src/content/file_info.rs +++ b/components/library/src/content/file_info.rs @@ -194,7 +194,7 @@ mod tests { #[test] fn can_find_valid_language_in_page() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let mut file = FileInfo::new_page( &Path::new("/home/vincent/code/site/content/posts/tutorials/python.fr.md"), &PathBuf::new(), @@ -207,7 +207,7 @@ mod tests { #[test] fn can_find_valid_language_in_page_with_assets() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let mut file = FileInfo::new_page( &Path::new("/home/vincent/code/site/content/posts/tutorials/python/index.fr.md"), &PathBuf::new(), @@ -233,7 +233,7 @@ mod tests { #[test] fn errors_on_unknown_language_in_page_with_i18n_on() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("it"), rss: false }); + config.languages.push(Language { code: String::from("it"), rss: false, search: false }); let mut file = FileInfo::new_page( &Path::new("/home/vincent/code/site/content/posts/tutorials/python.fr.md"), &PathBuf::new(), @@ -245,7 +245,7 @@ mod tests { #[test] fn can_find_valid_language_in_section() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let mut file = FileInfo::new_section( &Path::new("/home/vincent/code/site/content/posts/tutorials/_index.fr.md"), &PathBuf::new(), diff --git a/components/library/src/content/page.rs b/components/library/src/content/page.rs index 4573357..351a33a 100644 --- a/components/library/src/content/page.rs +++ b/components/library/src/content/page.rs @@ -736,7 +736,7 @@ Hello world #[test] fn can_specify_language_in_filename() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let content = r#" +++ +++ @@ -753,7 +753,7 @@ Bonjour le monde"# #[test] fn can_specify_language_in_filename_with_date() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let content = r#" +++ +++ @@ -772,7 +772,7 @@ Bonjour le monde"# #[test] fn i18n_frontmatter_path_overrides_default_permalink() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let content = r#" +++ path = "bonjour" diff --git a/components/library/src/content/section.rs b/components/library/src/content/section.rs index 21b700a..49fb879 100644 --- a/components/library/src/content/section.rs +++ b/components/library/src/content/section.rs @@ -350,7 +350,7 @@ mod tests { #[test] fn can_specify_language_in_filename() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let content = r#" +++ +++ @@ -372,7 +372,7 @@ Bonjour le monde"# #[test] fn can_make_links_to_translated_sections_without_double_trailing_slash() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let content = r#" +++ +++ @@ -389,7 +389,7 @@ Bonjour le monde"# #[test] fn can_make_links_to_translated_subsections_with_trailing_slash() { let mut config = Config::default(); - config.languages.push(Language { code: String::from("fr"), rss: false }); + config.languages.push(Language { code: String::from("fr"), rss: false, search: false }); let content = r#" +++ +++ diff --git a/components/library/src/taxonomies/mod.rs b/components/library/src/taxonomies/mod.rs index 4f5d8fa..f355124 100644 --- a/components/library/src/taxonomies/mod.rs +++ b/components/library/src/taxonomies/mod.rs @@ -361,7 +361,7 @@ mod tests { #[test] fn can_make_taxonomies_in_multiple_languages() { let mut config = Config::default(); - config.languages.push(Language { rss: false, code: "fr".to_string() }); + config.languages.push(Language { rss: false, code: "fr".to_string(), search: false }); let mut library = Library::new(2, 0, true); config.taxonomies = vec![ diff --git a/components/search/src/lib.rs b/components/search/src/lib.rs index 846e42e..86b8655 100644 --- a/components/search/src/lib.rs +++ b/components/search/src/lib.rs @@ -48,7 +48,9 @@ pub fn build_index(lang: &str, library: &Library) -> Result { let mut index = Index::with_language(language, &["title", "body"]); for section in library.sections_values() { - add_section_to_index(&mut index, section, library); + if section.lang == lang { + add_section_to_index(&mut index, section, library); + } } Ok(index.to_json()) diff --git a/components/site/src/lib.rs b/components/site/src/lib.rs index d1f1d06..8b1e78f 100644 --- a/components/site/src/lib.rs +++ b/components/site/src/lib.rs @@ -791,6 +791,18 @@ impl Site { ), )?; + for language in &self.config.languages { + if language.code != self.config.default_language && language.search { + create_file( + &self.output_path.join(&format!("search_index.{}.js", &language.code)), + &format!( + "window.searchIndex = {};", + search::build_index(&language.code, &self.library.read().unwrap())? + ), + )?; + } + } + // then elasticlunr.min.js create_file(&self.output_path.join("elasticlunr.min.js"), search::ELASTICLUNR_JS)?; diff --git a/components/site/tests/site_i18n.rs b/components/site/tests/site_i18n.rs index 8911a66..a1391f9 100644 --- a/components/site/tests/site_i18n.rs +++ b/components/site/tests/site_i18n.rs @@ -148,4 +148,9 @@ fn can_build_multilingual_site() { assert!(file_exists!(public, "fr/tags/index.html")); assert!(file_contains!(public, "fr/tags/index.html", "bonjour")); assert!(!file_contains!(public, "fr/tags/index.html", "hello")); + + // one lang index per language + assert!(file_exists!(public, "search_index.en.js")); + assert!(file_exists!(public, "search_index.it.js")); + assert!(!file_exists!(public, "search_index.fr.js")); } diff --git a/docs/content/documentation/content/multilingual.md b/docs/content/documentation/content/multilingual.md index d788972..a6eaba1 100644 --- a/docs/content/documentation/content/multilingual.md +++ b/docs/content/documentation/content/multilingual.md @@ -12,6 +12,7 @@ to your `config.toml`. For example: ```toml languages = [ {code = "fr", rss = true}, # there will be a RSS feed for French content + {code = "fr", search = true}, # there will be a Search Index for French content {code = "it"}, # there won't be a RSS feed for Italian content ] ``` diff --git a/docs/content/documentation/getting-started/configuration.md b/docs/content/documentation/getting-started/configuration.md index de95efb..cba1472 100644 --- a/docs/content/documentation/getting-started/configuration.md +++ b/docs/content/documentation/getting-started/configuration.md @@ -62,6 +62,7 @@ taxonomies = [] # Example: # languages = [ # {code = "fr", rss = true}, # there will be a RSS feed for French content +# {code = "fr", search = true}, # there will be a Search Index for French content # {code = "it"}, # there won't be a RSS feed for Italian content # ] # diff --git a/test_site_i18n/config.toml b/test_site_i18n/config.toml index 47ed8f5..a12f5e9 100644 --- a/test_site_i18n/config.toml +++ b/test_site_i18n/config.toml @@ -9,7 +9,9 @@ compile_sass = false highlight_code = false # Whether to build a search index to be used later on by a JavaScript library -build_search_index = false +build_search_index = true + +default_language = "en" generate_rss = true @@ -22,7 +24,7 @@ taxonomies = [ languages = [ {code = "fr", rss = true}, - {code = "it", rss = false}, + {code = "it", rss = false, search = true }, ] [extra] From 096fefe7ed8bffe49837c4558925f408c1c6e2a8 Mon Sep 17 00:00:00 2001 From: Zdenek Crha <35028759+zdenek-crha@users.noreply.github.com> Date: Wed, 4 Sep 2019 20:30:32 +0200 Subject: [PATCH 60/67] Remove pub visibility from Config::translations hash (#796) The access to translations is not straightforward and requires checks if language and key exists. It is better to forbit direct access to attribute and provide method - `get_translation()` - that will handle all details of key translations. Remove unit tests that use direct access and test only public method. --- components/config/src/config.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/components/config/src/config.rs b/components/config/src/config.rs index 4f3dab5..7a38760 100644 --- a/components/config/src/config.rs +++ b/components/config/src/config.rs @@ -110,7 +110,10 @@ pub struct Config { /// /// The `String` key of `HashMap` is a language name, the value should be toml crate `Table` /// with String key representing term and value another `String` representing its translation. - pub translations: HashMap, + /// + /// The attribute is intentionally not public, use `get_translation()` method for translating + /// key into different language. + translations: HashMap, /// Whether to highlight all code blocks found in markdown files. Defaults to false pub highlight_code: bool, @@ -478,15 +481,6 @@ title = "Un titre" title = "A title" "#; - #[test] - fn can_use_language_configuration() { - let config = Config::parse(CONFIG_TRANSLATION); - assert!(config.is_ok()); - let translations = config.unwrap().translations; - assert_eq!(translations["fr"]["title"].as_str(), "Un titre"); - assert_eq!(translations["en"]["title"].as_str(), "A title"); - } - #[test] fn can_use_present_translation() { let config = Config::parse(CONFIG_TRANSLATION).unwrap(); From 52c2b74b395571df6671be08273d0fce9ccd0575 Mon Sep 17 00:00:00 2001 From: Neil Kistner Date: Wed, 4 Sep 2019 13:31:19 -0500 Subject: [PATCH 61/67] Add anchor existence checking to link_checker component (#786) * Add anchor existant checking to link_checker component * Oops, forgot some changes * Drop scraper dependency and rework tests * Handle name attributes --- Cargo.lock | 1 + components/link_checker/Cargo.toml | 2 + components/link_checker/src/lib.rs | 101 ++++++++++++++++++++++++++++- 3 files changed, 103 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index ea3f288..3b177d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1223,6 +1223,7 @@ dependencies = [ name = "link_checker" version = "0.1.0" dependencies = [ + "errors 0.1.0", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/components/link_checker/Cargo.toml b/components/link_checker/Cargo.toml index 2c2715d..d40a234 100644 --- a/components/link_checker/Cargo.toml +++ b/components/link_checker/Cargo.toml @@ -6,3 +6,5 @@ authors = ["Vincent Prouillet "] [dependencies] reqwest = "0.9" lazy_static = "1" + +errors = { path = "../errors" } diff --git a/components/link_checker/src/lib.rs b/components/link_checker/src/lib.rs index ce6c36a..10297f9 100644 --- a/components/link_checker/src/lib.rs +++ b/components/link_checker/src/lib.rs @@ -2,8 +2,13 @@ extern crate reqwest; #[macro_use] extern crate lazy_static; +extern crate errors; + use reqwest::header::{HeaderMap, ACCEPT}; use reqwest::StatusCode; + +use errors::Result; + use std::collections::HashMap; use std::error::Error; use std::sync::{Arc, RwLock}; @@ -62,6 +67,12 @@ pub fn check_url(url: &str) -> LinkResult { // Need to actually do the link checking let res = match client.get(url).headers(headers).send() { + Ok(ref mut response) if has_anchor(url) => { + match check_page_for_anchor(url, response.text()) { + Ok(_) => LinkResult { code: Some(response.status()), error: None }, + Err(e) => LinkResult { code: None, error: Some(e.to_string()) }, + } + } Ok(response) => LinkResult { code: Some(response.status()), error: None }, Err(e) => LinkResult { code: None, error: Some(e.description().to_string()) }, }; @@ -70,9 +81,37 @@ pub fn check_url(url: &str) -> LinkResult { res } +fn has_anchor(url: &str) -> bool { + match url.find('#') { + Some(index) => match url.get(index..=index + 1) { + Some("#/") | Some("#!") | None => false, + Some(_) => true, + }, + None => false, + } +} + +fn check_page_for_anchor(url: &str, body: reqwest::Result) -> Result<()> { + let body = body.unwrap(); + let index = url.find('#').unwrap(); + let anchor = url.get(index + 1..).unwrap(); + let checks: [String; 4] = [ + format!(" id='{}'", anchor), + format!(r#" id="{}""#, anchor), + format!(" name='{}'", anchor), + format!(r#" name="{}""#, anchor), + ]; + + if checks.iter().any(|check| body[..].contains(&check[..])) { + Ok(()) + } else { + Err(errors::Error::from(format!("Anchor `#{}` not found on page", anchor))) + } +} + #[cfg(test)] mod tests { - use super::{check_url, LINKS}; + use super::{check_page_for_anchor, check_url, has_anchor, LINKS}; #[test] fn can_validate_ok_links() { @@ -91,4 +130,64 @@ mod tests { assert!(res.code.is_none()); assert!(res.error.is_some()); } + + #[test] + fn can_validate_anchors() { + let url = "https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.collect"; + let body = "

collect

".to_string(); + let res = check_page_for_anchor(url, Ok(body)); + assert!(res.is_ok()); + } + + #[test] + fn can_validate_anchors_with_other_quotes() { + let url = "https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.collect"; + let body = r#"

collect

"#.to_string(); + let res = check_page_for_anchor(url, Ok(body)); + assert!(res.is_ok()); + } + + #[test] + fn can_validate_anchors_with_name_attr() { + let url = "https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.collect"; + let body = r#"

collect

"#.to_string(); + let res = check_page_for_anchor(url, Ok(body)); + assert!(res.is_ok()); + } + + #[test] + fn can_fail_when_anchor_not_found() { + let url = "https://doc.rust-lang.org/std/iter/trait.Iterator.html#me"; + let body = "

collect

".to_string(); + let res = check_page_for_anchor(url, Ok(body)); + assert!(res.is_err()); + } + + #[test] + fn can_check_url_for_anchor() { + let url = "https://doc.rust-lang.org/std/index.html#the-rust-standard-library"; + let res = has_anchor(url); + assert_eq!(res, true); + } + + #[test] + fn will_return_false_when_no_anchor() { + let url = "https://doc.rust-lang.org/std/index.html"; + let res = has_anchor(url); + assert_eq!(res, false); + } + + #[test] + fn will_return_false_when_has_router_url() { + let url = "https://doc.rust-lang.org/#/std"; + let res = has_anchor(url); + assert_eq!(res, false); + } + + #[test] + fn will_return_false_when_has_router_url_alt() { + let url = "https://doc.rust-lang.org/#!/std"; + let res = has_anchor(url); + assert_eq!(res, false); + } } From 4fd5d3f348c481e30af698d3249715bd9d6355be Mon Sep 17 00:00:00 2001 From: Marcus Klaas de Vries Date: Fri, 6 Sep 2019 21:36:30 +0000 Subject: [PATCH 62/67] Bump pulldown_cmark to version 0.6.0 (#797) * Bump pulldown_cmark to version 0.6.0 * Rename headers to headings --- Cargo.lock | 18 +-- components/library/src/content/mod.rs | 20 ++-- components/library/src/content/page.rs | 6 +- components/library/src/content/section.rs | 6 +- components/rendering/Cargo.toml | 2 +- components/rendering/src/lib.rs | 2 +- components/rendering/src/markdown.rs | 64 +++++----- components/rendering/src/table_of_contents.rs | 109 +++++++++--------- components/rendering/tests/markdown.rs | 44 +++---- components/templates/Cargo.toml | 2 +- 10 files changed, 136 insertions(+), 137 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b177d3..564f876 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1323,7 +1323,7 @@ name = "mime" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1332,7 +1332,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1800,13 +1800,13 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.5.3" +version = "0.6.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)", "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2053,7 +2053,7 @@ dependencies = [ "link_checker 0.1.0", "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (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)", @@ -2521,7 +2521,7 @@ dependencies = [ "imageproc 0.1.0", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "library 0.1.0", - "pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2894,7 +2894,7 @@ dependencies = [ [[package]] name = "unicase" -version = "2.4.0" +version = "2.5.1" 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)", @@ -3367,7 +3367,7 @@ dependencies = [ "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802" "checksum publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9bf259a81de2b2eb9850ec990ec78e6a25319715584fd7652b9b26f96fcb1510" -"checksum pulldown-cmark 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357" +"checksum pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85b0ad0d4c1702965ee6bb5b4ff5e71f83850b497d497e9444302987bf9e26a4" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "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" @@ -3473,7 +3473,7 @@ dependencies = [ "checksum unic-segment 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" "checksum unic-ucd-segment 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" "checksum unic-ucd-version 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" +"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150" "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" diff --git a/components/library/src/content/mod.rs b/components/library/src/content/mod.rs index ac98d5d..dc00271 100644 --- a/components/library/src/content/mod.rs +++ b/components/library/src/content/mod.rs @@ -8,9 +8,9 @@ pub use self::page::Page; pub use self::section::Section; pub use self::ser::{SerializingPage, SerializingSection}; -use rendering::Header; +use rendering::Heading; -pub fn has_anchor(headings: &[Header], anchor: &str) -> bool { +pub fn has_anchor(headings: &[Heading], anchor: &str) -> bool { for heading in headings { if heading.id == anchor { return true; @@ -30,28 +30,28 @@ mod tests { #[test] fn can_find_anchor_at_root() { let input = vec![ - Header { + Heading { level: 1, id: "1".to_string(), permalink: String::new(), title: String::new(), children: vec![], }, - Header { + Heading { level: 2, id: "1-1".to_string(), permalink: String::new(), title: String::new(), children: vec![], }, - Header { + Heading { level: 3, id: "1-1-1".to_string(), permalink: String::new(), title: String::new(), children: vec![], }, - Header { + Heading { level: 2, id: "1-2".to_string(), permalink: String::new(), @@ -65,27 +65,27 @@ mod tests { #[test] fn can_find_anchor_in_children() { - let input = vec![Header { + let input = vec![Heading { level: 1, id: "1".to_string(), permalink: String::new(), title: String::new(), children: vec![ - Header { + Heading { level: 2, id: "1-1".to_string(), permalink: String::new(), title: String::new(), children: vec![], }, - Header { + Heading { level: 3, id: "1-1-1".to_string(), permalink: String::new(), title: String::new(), children: vec![], }, - Header { + Heading { level: 2, id: "1-2".to_string(), permalink: String::new(), diff --git a/components/library/src/content/page.rs b/components/library/src/content/page.rs index 351a33a..4b59096 100644 --- a/components/library/src/content/page.rs +++ b/components/library/src/content/page.rs @@ -11,7 +11,7 @@ use config::Config; use errors::{Error, Result}; use front_matter::{split_page_content, InsertAnchor, PageFrontMatter}; use library::Library; -use rendering::{render_content, Header, RenderContext}; +use rendering::{render_content, Heading, RenderContext}; use utils::fs::{find_related_assets, read_file}; use utils::site::get_reading_analytics; use utils::templates::render_template; @@ -65,8 +65,8 @@ pub struct Page { pub lighter: Option, /// The heavier page, for pages sorted by weight pub heavier: Option, - /// Toc made from the headers of the markdown file - pub toc: Vec
, + /// Toc made from the headings of the markdown file + pub toc: Vec, /// How many words in the raw content pub word_count: Option, /// How long would it take to read the raw content. diff --git a/components/library/src/content/section.rs b/components/library/src/content/section.rs index 49fb879..b23d40f 100644 --- a/components/library/src/content/section.rs +++ b/components/library/src/content/section.rs @@ -7,7 +7,7 @@ use tera::{Context as TeraContext, Tera}; use config::Config; use errors::{Error, Result}; use front_matter::{split_section_content, SectionFrontMatter}; -use rendering::{render_content, Header, RenderContext}; +use rendering::{render_content, Heading, RenderContext}; use utils::fs::{find_related_assets, read_file}; use utils::site::get_reading_analytics; use utils::templates::render_template; @@ -45,8 +45,8 @@ pub struct Section { pub ancestors: Vec, /// All direct subsections pub subsections: Vec, - /// Toc made from the headers of the markdown file - pub toc: Vec
, + /// Toc made from the headings of the markdown file + pub toc: Vec, /// How many words in the raw content pub word_count: Option, /// How long would it take to read the raw content. diff --git a/components/rendering/Cargo.toml b/components/rendering/Cargo.toml index 82ec273..6fe54d5 100644 --- a/components/rendering/Cargo.toml +++ b/components/rendering/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Vincent Prouillet "] [dependencies] tera = { version = "1.0.0-beta.10", features = ["preserve_order"] } syntect = "=3.2.0" -pulldown-cmark = "0.5" +pulldown-cmark = "0.6" slug = "0.1" serde = "1" serde_derive = "1" diff --git a/components/rendering/src/lib.rs b/components/rendering/src/lib.rs index 61742b6..542b32f 100644 --- a/components/rendering/src/lib.rs +++ b/components/rendering/src/lib.rs @@ -32,7 +32,7 @@ use errors::Result; pub use context::RenderContext; use markdown::markdown_to_html; pub use shortcode::render_shortcodes; -pub use table_of_contents::Header; +pub use table_of_contents::Heading; pub fn render_content(content: &str, context: &RenderContext) -> Result { // Don't do shortcodes if there is nothing like a shortcode in the content diff --git a/components/rendering/src/markdown.rs b/components/rendering/src/markdown.rs index 5d90373..437f558 100644 --- a/components/rendering/src/markdown.rs +++ b/components/rendering/src/markdown.rs @@ -9,7 +9,7 @@ use config::highlighting::{get_highlighter, SYNTAX_SET, THEME_SET}; use context::RenderContext; use errors::{Error, Result}; use front_matter::InsertAnchor; -use table_of_contents::{make_table_of_contents, Header}; +use table_of_contents::{make_table_of_contents, Heading}; use utils::site::resolve_internal_link; use utils::vec::InsertMany; @@ -23,23 +23,23 @@ const ANCHOR_LINK_TEMPLATE: &str = "anchor-link.html"; pub struct Rendered { pub body: String, pub summary_len: Option, - pub toc: Vec
, + pub toc: Vec, pub internal_links_with_anchors: Vec<(String, String)>, pub external_links: Vec, } -// tracks a header in a slice of pulldown-cmark events +// tracks a heading in a slice of pulldown-cmark events #[derive(Debug)] -struct HeaderRef { +struct HeadingRef { start_idx: usize, end_idx: usize, - level: i32, + level: u32, id: Option, } -impl HeaderRef { - fn new(start: usize, level: i32) -> HeaderRef { - HeaderRef { start_idx: start, end_idx: 0, level, id: None } +impl HeadingRef { + fn new(start: usize, level: u32) -> HeadingRef { + HeadingRef { start_idx: start, end_idx: 0, level, id: None } } } @@ -125,23 +125,23 @@ fn get_text(parser_slice: &[Event]) -> String { title } -fn get_header_refs(events: &[Event]) -> Vec { - let mut header_refs = vec![]; +fn get_heading_refs(events: &[Event]) -> Vec { + let mut heading_refs = vec![]; for (i, event) in events.iter().enumerate() { match event { - Event::Start(Tag::Header(level)) => { - header_refs.push(HeaderRef::new(i, *level)); + Event::Start(Tag::Heading(level)) => { + heading_refs.push(HeadingRef::new(i, *level)); } - Event::End(Tag::Header(_)) => { - let msg = "Header end before start?"; - header_refs.last_mut().expect(msg).end_idx = i; + Event::End(Tag::Heading(_)) => { + let msg = "Heading end before start?"; + heading_refs.last_mut().expect(msg).end_idx = i; } _ => (), } } - header_refs + heading_refs } pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result { @@ -154,7 +154,7 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result = None; let mut inserted_anchors: Vec = vec![]; - let mut headers: Vec
= vec![]; + let mut headings: Vec = vec![]; let mut internal_links_with_anchors = Vec::new(); let mut external_links = Vec::new(); @@ -247,14 +247,14 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result>(); // We need to collect the events to make a second pass - let mut header_refs = get_header_refs(&events); + let mut heading_refs = get_heading_refs(&events); let mut anchors_to_insert = vec![]; - // First header pass: look for a manually-specified IDs, e.g. `# Heading text {#hash}` + // First heading pass: look for a manually-specified IDs, e.g. `# Heading text {#hash}` // (This is a separate first pass so that auto IDs can avoid collisions with manual IDs.) - for header_ref in header_refs.iter_mut() { - let end_idx = header_ref.end_idx; + for heading_ref in heading_refs.iter_mut() { + let end_idx = heading_ref.end_idx; if let Event::Text(ref mut text) = events[end_idx - 1] { if text.as_bytes().last() == Some(&b'}') { if let Some(mut i) = text.find("{#") { @@ -263,24 +263,24 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result 0 && text.as_bytes()[i - 1] == b' ' { i -= 1; } - header_ref.id = Some(id); + heading_ref.id = Some(id); *text = text[..i].to_owned().into(); } } } } - // Second header pass: auto-generate remaining IDs, and emit HTML - for header_ref in header_refs { - let start_idx = header_ref.start_idx; - let end_idx = header_ref.end_idx; + // Second heading pass: auto-generate remaining IDs, and emit HTML + for heading_ref in heading_refs { + let start_idx = heading_ref.start_idx; + let end_idx = heading_ref.end_idx; let title = get_text(&events[start_idx + 1..end_idx]); let id = - header_ref.id.unwrap_or_else(|| find_anchor(&inserted_anchors, slugify(&title), 0)); + heading_ref.id.unwrap_or_else(|| find_anchor(&inserted_anchors, slugify(&title), 0)); inserted_anchors.push(id.clone()); // insert `id` to the tag - let html = format!("", lvl = header_ref.level, id = id); + let html = format!("", lvl = heading_ref.level, id = id); events[start_idx] = Event::Html(html.into()); // generate anchors and places to insert them @@ -303,10 +303,10 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result Result, + pub children: Vec, } -impl Header { - pub fn new(level: i32) -> Header { - Header { +impl Heading { + pub fn new(level: u32) -> Heading { + Heading { level, id: String::new(), permalink: String::new(), @@ -21,49 +21,48 @@ impl Header { } } -impl Default for Header { +impl Default for Heading { fn default() -> Self { - Header::new(0) + Heading::new(0) } } -// Takes a potential (mutable) parent and a header to try and insert into +// Takes a potential (mutable) parent and a heading to try and insert into // Returns true when it performed the insertion, false otherwise -fn insert_into_parent(potential_parent: Option<&mut Header>, header: &Header) -> bool { +fn insert_into_parent(potential_parent: Option<&mut Heading>, heading: &Heading) -> bool { match potential_parent { None => { // No potential parent to insert into so it needs to be insert higher false } Some(parent) => { - let diff = header.level - parent.level; - if diff <= 0 { + if heading.level <= parent.level { // Heading is same level or higher so we don't insert here return false; } - if diff == 1 { + if heading.level + 1 == parent.level { // We have a direct child of the parent - parent.children.push(header.clone()); + parent.children.push(heading.clone()); return true; } // We need to go deeper - if !insert_into_parent(parent.children.iter_mut().last(), header) { + if !insert_into_parent(parent.children.iter_mut().last(), heading) { // No, we need to insert it here - parent.children.push(header.clone()); + parent.children.push(heading.clone()); } true } } } -/// Converts the flat temp headers into a nested set of headers +/// Converts the flat temp headings into a nested set of headings /// representing the hierarchy -pub fn make_table_of_contents(headers: Vec
) -> Vec
{ +pub fn make_table_of_contents(headings: Vec) -> Vec { let mut toc = vec![]; - for header in headers { - // First header or we try to insert the current header in a previous one - if toc.is_empty() || !insert_into_parent(toc.iter_mut().last(), &header) { - toc.push(header); + for heading in headings { + // First heading or we try to insert the current heading in a previous one + if toc.is_empty() || !insert_into_parent(toc.iter_mut().last(), &heading) { + toc.push(heading); } } @@ -76,7 +75,7 @@ mod tests { #[test] fn can_make_basic_toc() { - let input = vec![Header::new(1), Header::new(1), Header::new(1)]; + let input = vec![Heading::new(1), Heading::new(1), Heading::new(1)]; let toc = make_table_of_contents(input); assert_eq!(toc.len(), 3); } @@ -84,15 +83,15 @@ mod tests { #[test] fn can_make_more_complex_toc() { let input = vec![ - Header::new(1), - Header::new(2), - Header::new(2), - Header::new(3), - Header::new(2), - Header::new(1), - Header::new(2), - Header::new(3), - Header::new(3), + Heading::new(1), + Heading::new(2), + Heading::new(2), + Heading::new(3), + Heading::new(2), + Heading::new(1), + Heading::new(2), + Heading::new(3), + Heading::new(3), ]; let toc = make_table_of_contents(input); assert_eq!(toc.len(), 2); @@ -105,12 +104,12 @@ mod tests { #[test] fn can_make_deep_toc() { let input = vec![ - Header::new(1), - Header::new(2), - Header::new(3), - Header::new(4), - Header::new(5), - Header::new(4), + Heading::new(1), + Heading::new(2), + Heading::new(3), + Heading::new(4), + Heading::new(5), + Heading::new(4), ]; let toc = make_table_of_contents(input); assert_eq!(toc.len(), 1); @@ -123,16 +122,16 @@ mod tests { #[test] fn can_make_deep_messy_toc() { let input = vec![ - Header::new(2), // toc[0] - Header::new(3), - Header::new(4), - Header::new(5), - Header::new(4), - Header::new(2), // toc[1] - Header::new(1), // toc[2] - Header::new(2), - Header::new(3), - Header::new(4), + Heading::new(2), // toc[0] + Heading::new(3), + Heading::new(4), + Heading::new(5), + Heading::new(4), + Heading::new(2), // toc[1] + Heading::new(1), // toc[2] + Heading::new(2), + Heading::new(3), + Heading::new(4), ]; let toc = make_table_of_contents(input); assert_eq!(toc.len(), 3); @@ -148,13 +147,13 @@ mod tests { #[test] fn can_make_messy_toc() { let input = vec![ - Header::new(3), - Header::new(2), - Header::new(2), - Header::new(3), - Header::new(2), - Header::new(1), - Header::new(4), + Heading::new(3), + Heading::new(2), + Heading::new(2), + Heading::new(3), + Heading::new(2), + Heading::new(1), + Heading::new(4), ]; let toc = make_table_of_contents(input); println!("{:#?}", toc); diff --git a/components/rendering/tests/markdown.rs b/components/rendering/tests/markdown.rs index 9c1e2d5..94777a2 100644 --- a/components/rendering/tests/markdown.rs +++ b/components/rendering/tests/markdown.rs @@ -332,7 +332,7 @@ fn errors_relative_link_inexistant() { } #[test] -fn can_add_id_to_headers() { +fn can_add_id_to_headings() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); let config = Config::default(); @@ -342,7 +342,7 @@ fn can_add_id_to_headers() { } #[test] -fn can_add_id_to_headers_same_slug() { +fn can_add_id_to_headings_same_slug() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); let config = Config::default(); @@ -352,7 +352,7 @@ fn can_add_id_to_headers_same_slug() { } #[test] -fn can_handle_manual_ids_on_headers() { +fn can_handle_manual_ids_on_headings() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); let config = Config::default(); @@ -361,7 +361,7 @@ fn can_handle_manual_ids_on_headers() { // manual IDs; that duplicates are in fact permitted among manual IDs; that any non-plain-text // in the middle of `{#…}` will disrupt it from being acknowledged as a manual ID (that last // one could reasonably be considered a bug rather than a feature, but test it either way); one - // workaround for the improbable case where you actually want `{#…}` at the end of a header. + // workaround for the improbable case where you actually want `{#…}` at the end of a heading. let res = render_content( "\ # Hello\n\ @@ -389,7 +389,7 @@ fn can_handle_manual_ids_on_headers() { } #[test] -fn blank_headers() { +fn blank_headings() { let tera_ctx = Tera::default(); let permalinks_ctx = HashMap::new(); let config = Config::default(); @@ -426,7 +426,7 @@ fn can_insert_anchor_right() { } #[test] -fn can_insert_anchor_for_multi_header() { +fn can_insert_anchor_for_multi_heading() { let permalinks_ctx = HashMap::new(); let config = Config::default(); let context = RenderContext::new(&ZOLA_TERA, &config, "", &permalinks_ctx, InsertAnchor::Right); @@ -490,11 +490,11 @@ fn can_make_toc() { let res = render_content( r#" -# Header 1 +# Heading 1 -## Header 2 +## Heading 2 -## Another Header 2 +## Another Heading 2 ### Last one "#, @@ -522,9 +522,9 @@ fn can_ignore_tags_in_toc() { let res = render_content( r#" -## header with `code` +## heading with `code` -## [anchor](https://duckduckgo.com/) in header +## [anchor](https://duckduckgo.com/) in heading ## **bold** and *italics* "#, @@ -534,11 +534,11 @@ fn can_ignore_tags_in_toc() { let toc = res.toc; - assert_eq!(toc[0].id, "header-with-code"); - assert_eq!(toc[0].title, "header with code"); + assert_eq!(toc[0].id, "heading-with-code"); + assert_eq!(toc[0].title, "heading with code"); - assert_eq!(toc[1].id, "anchor-in-header"); - assert_eq!(toc[1].title, "anchor in header"); + assert_eq!(toc[1].id, "anchor-in-heading"); + assert_eq!(toc[1].title, "anchor in heading"); assert_eq!(toc[2].id, "bold-and-italics"); assert_eq!(toc[2].title, "bold and italics"); @@ -564,7 +564,7 @@ fn can_understand_backtick_in_paragraphs() { // https://github.com/Keats/gutenberg/issues/297 #[test] -fn can_understand_links_in_header() { +fn can_understand_links_in_heading() { let permalinks_ctx = HashMap::new(); let config = Config::default(); let context = RenderContext::new(&ZOLA_TERA, &config, "", &permalinks_ctx, InsertAnchor::None); @@ -573,7 +573,7 @@ fn can_understand_links_in_header() { } #[test] -fn can_understand_link_with_title_in_header() { +fn can_understand_link_with_title_in_heading() { let permalinks_ctx = HashMap::new(); let config = Config::default(); let context = RenderContext::new(&ZOLA_TERA, &config, "", &permalinks_ctx, InsertAnchor::None); @@ -586,7 +586,7 @@ fn can_understand_link_with_title_in_header() { } #[test] -fn can_understand_emphasis_in_header() { +fn can_understand_emphasis_in_heading() { let permalinks_ctx = HashMap::new(); let config = Config::default(); let context = RenderContext::new(&ZOLA_TERA, &config, "", &permalinks_ctx, InsertAnchor::None); @@ -595,7 +595,7 @@ fn can_understand_emphasis_in_header() { } #[test] -fn can_understand_strong_in_header() { +fn can_understand_strong_in_heading() { let permalinks_ctx = HashMap::new(); let config = Config::default(); let context = RenderContext::new(&ZOLA_TERA, &config, "", &permalinks_ctx, InsertAnchor::None); @@ -604,7 +604,7 @@ fn can_understand_strong_in_header() { } #[test] -fn can_understand_code_in_header() { +fn can_understand_code_in_heading() { let permalinks_ctx = HashMap::new(); let config = Config::default(); let context = RenderContext::new(&ZOLA_TERA, &config, "", &permalinks_ctx, InsertAnchor::None); @@ -614,7 +614,7 @@ fn can_understand_code_in_header() { // See https://github.com/getzola/zola/issues/569 #[test] -fn can_understand_footnote_in_header() { +fn can_understand_footnote_in_heading() { let permalinks_ctx = HashMap::new(); let config = Config::default(); let context = RenderContext::new(&ZOLA_TERA, &config, "", &permalinks_ctx, InsertAnchor::None); @@ -627,7 +627,7 @@ fn can_understand_footnote_in_header() { } #[test] -fn can_make_valid_relative_link_in_header() { +fn can_make_valid_relative_link_in_heading() { let mut permalinks = HashMap::new(); permalinks.insert("pages/about.md".to_string(), "https://vincent.is/about/".to_string()); let tera_ctx = Tera::default(); diff --git a/components/templates/Cargo.toml b/components/templates/Cargo.toml index 7e9dc87..7e8a4c9 100644 --- a/components/templates/Cargo.toml +++ b/components/templates/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Vincent Prouillet "] tera = "1.0.0-beta.10" base64 = "0.10" lazy_static = "1" -pulldown-cmark = "0.5" +pulldown-cmark = "0.6" toml = "0.5" csv = "1" image = "0.22" From 58440474359d55a94381d0210479261ea386af9e Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Mon, 16 Sep 2019 11:44:39 +0200 Subject: [PATCH 63/67] Update slotmap --- Cargo.lock | 480 +++++++++++----------- components/library/Cargo.toml | 2 +- components/library/src/content/page.rs | 14 +- components/library/src/content/section.rs | 12 +- components/library/src/library.rs | 34 +- components/library/src/pagination/mod.rs | 4 +- components/library/src/sorting.rs | 8 +- components/library/src/taxonomies/mod.rs | 8 +- 8 files changed, 275 insertions(+), 287 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 564f876..ef82d66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,7 +6,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -14,15 +14,16 @@ dependencies = [ [[package]] name = "actix-connect" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -35,15 +36,15 @@ name = "actix-files" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "v_htmlescape 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -51,11 +52,11 @@ dependencies = [ [[package]] name = "actix-http" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-connect 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-connect 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -63,25 +64,25 @@ dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_rs 0.8.19 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "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)", - "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.1 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -101,19 +102,19 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.99 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "actix-rt" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -125,10 +126,10 @@ name = "actix-server" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -146,7 +147,7 @@ name = "actix-server-config" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -156,7 +157,7 @@ name = "actix-service" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -165,7 +166,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -181,8 +182,8 @@ dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -194,9 +195,9 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -205,15 +206,15 @@ dependencies = [ "actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_rs 0.8.19 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.99 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -292,7 +293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "backtrace" -version = "0.3.35" +version = "0.3.37" 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)", @@ -306,7 +307,7 @@ name = "backtrace-sys" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", ] @@ -325,7 +326,7 @@ 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)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -354,13 +355,13 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.7" +version = "0.2.8" 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)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex-automata 0.1.8 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -379,7 +380,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -394,7 +395,7 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.41" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -404,13 +405,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "chrono" -version = "0.4.7" +version = "0.4.9" 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)", - "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -445,12 +446,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "config" version = "0.1.0" dependencies = [ - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (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 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -475,7 +476,7 @@ dependencies = [ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "publicsuffix 1.5.3 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -517,15 +518,6 @@ dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "crossbeam-deque" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "crossbeam-deque" version = "0.7.1" @@ -570,11 +562,11 @@ name = "csv" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bstr 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "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)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -611,7 +603,7 @@ dependencies = [ "lazy_static 1.4.0 (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.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -636,7 +628,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "either" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -645,10 +637,10 @@ version = "2.3.6" 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)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rust-stemmers 1.1.0 (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 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -656,7 +648,7 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.17" +version = "0.8.19" 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)", @@ -677,7 +669,7 @@ name = "error-chain" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -685,7 +677,7 @@ dependencies = [ name = "errors" version = "0.1.0" dependencies = [ - "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -696,7 +688,7 @@ name = "failure" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -718,12 +710,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "filetime" -version = "0.2.5" +version = "0.2.7" 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_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)", ] [[package]] @@ -759,12 +752,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "front_matter" version = "0.1.0" dependencies = [ - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (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)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -822,7 +815,7 @@ dependencies = [ [[package]] name = "futures" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -830,7 +823,7 @@ name = "futures-cpupool" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -852,12 +845,12 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.11" +version = "0.1.12" 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.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -880,10 +873,10 @@ version = "0.4.4" 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)", - "bstr 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -903,9 +896,9 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -963,7 +956,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -980,7 +973,7 @@ source = "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)", @@ -988,11 +981,11 @@ dependencies = [ [[package]] name = "hyper" -version = "0.12.33" +version = "0.12.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1021,8 +1014,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1057,7 +1050,7 @@ 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)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1066,13 +1059,12 @@ dependencies = [ [[package]] name = "image" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1086,17 +1078,17 @@ name = "imageproc" version = "0.1.0" dependencies = [ "errors 0.1.0", - "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] [[package]] name = "indexmap" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1156,7 +1148,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1192,18 +1184,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "library" version = "0.1.0" dependencies = [ - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "config 0.1.0", "errors 0.1.0", "front_matter 0.1.0", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rendering 0.1.0", - "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)", - "slotmap 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "slotmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1289,11 +1281,11 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.24 (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 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1320,18 +1312,15 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "mime_guess" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1340,7 +1329,7 @@ name = "miniz-sys" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", ] @@ -1439,7 +1428,7 @@ version = "0.14.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)", - "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.45 (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)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1461,11 +1450,11 @@ dependencies = [ [[package]] name = "notify" -version = "4.0.12" +version = "4.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1548,8 +1537,8 @@ name = "onig_sys" version = "69.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (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.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1589,9 +1578,9 @@ version = "0.9.49" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", + "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1660,7 +1649,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pest" -version = "2.1.1" +version = "2.1.2" 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)", @@ -1671,29 +1660,29 @@ name = "pest_derive" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", ] [[package]] name = "pest_generator" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pest_meta 2.1.1 (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)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", + "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.3 (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)", ] [[package]] name = "pest_meta" -version = "2.1.1" +version = "2.1.2" 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.1 (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)", ] @@ -1733,7 +1722,7 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1743,9 +1732,9 @@ 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)", + "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.101 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1780,7 +1769,7 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.1" +version = "1.0.3" 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)", @@ -1794,7 +1783,7 @@ dependencies = [ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1827,7 +1816,7 @@ name = "quote" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1850,10 +1839,10 @@ dependencies = [ [[package]] name = "rand" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1896,7 +1885,7 @@ name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1965,20 +1954,20 @@ dependencies = [ [[package]] name = "rayon" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rayon-core" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2012,12 +2001,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "regex" -version = "1.2.1" +version = "1.3.1" 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.11 (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)", ] @@ -2031,7 +2020,7 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2051,12 +2040,12 @@ dependencies = [ "front_matter 0.1.0", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "link_checker 0.1.0", - "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (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)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", @@ -2073,17 +2062,17 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_rs 0.8.19 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2111,8 +2100,8 @@ name = "rust-stemmers" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "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 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2160,10 +2149,10 @@ name = "sass-sys" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", "num_cpus 1.10.1 (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.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2235,18 +2224,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.99" +version = "1.0.101" 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.101 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.99" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.3 (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)", ] @@ -2256,10 +2245,10 @@ name = "serde_json" version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "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)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2269,7 +2258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2280,7 +2269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.4 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2334,11 +2323,11 @@ dependencies = [ "imageproc 0.1.0", "library 0.1.0", "link_checker 0.1.0", - "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "search 0.1.0", - "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 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2352,7 +2341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "slotmap" -version = "0.2.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2401,20 +2390,20 @@ dependencies = [ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "precomputed-hash 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)", - "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_codegen" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.24 (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)", + "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2459,7 +2448,7 @@ name = "syn" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2488,9 +2477,9 @@ dependencies = [ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "onig 4.3.3 (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.11 (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)", + "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.101 (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)", "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2503,7 +2492,7 @@ 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)", - "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2517,7 +2506,7 @@ dependencies = [ "config 0.1.0", "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", - "image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)", "imageproc 0.1.0", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "library 0.1.0", @@ -2545,14 +2534,14 @@ name = "tera" version = "1.0.0-beta.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "globwalk 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.99 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "unic-segment 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2618,7 +2607,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2636,8 +2625,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2646,7 +2635,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2655,7 +2644,7 @@ name = "tokio-current-thread" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2665,7 +2654,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2674,7 +2663,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2684,7 +2673,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2701,7 +2690,7 @@ name = "tokio-signal" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2718,7 +2707,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2727,7 +2716,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2742,7 +2731,7 @@ dependencies = [ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2756,18 +2745,18 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-udp" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2780,7 +2769,7 @@ name = "toml" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2791,7 +2780,7 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "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)", @@ -2803,7 +2792,7 @@ dependencies = [ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-udp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2814,7 +2803,7 @@ 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)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "ipconfig 0.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)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2966,7 +2955,7 @@ name = "utils" version = "0.1.0" dependencies = [ "errors 0.1.0", - "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3045,14 +3034,14 @@ name = "want" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wasi" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3168,14 +3157,14 @@ dependencies = [ "actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "errors 0.1.0", "front_matter 0.1.0", "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)", + "notify 4.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rebuild 0.1.0", "site 0.1.0", @@ -3187,11 +3176,11 @@ dependencies = [ [metadata] "checksum actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2c11af4b06dc935d8e1b1491dad56bfb32febc49096a91e773f8535c176453" -"checksum actix-connect 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "646be02316c497d1cb8b1ed82eb723b052d6b3e2462c94bd52d0ac2d4a29a165" +"checksum actix-connect 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9fade9bd4bb46bacde89f1e726c7a3dd230536092712f5d94d77ca57c087fca0" "checksum actix-files 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e4640b28cd96059541c932f6f350c63c76688e43d68305cdb88e0004da12b5" -"checksum actix-http 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "de5aaeef8b9eef653b910f957a02bea9c1b375f7fa49b411fb75dad8f41462eb" +"checksum actix-http 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf758ebbc4abfecbdc1ce7408601b2d7e0cd7e4766ef61183cd8ce16c194d64" "checksum actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "23224bb527e204261d0291102cb9b52713084def67d94f7874923baefe04ccf7" -"checksum actix-rt 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "18d9054b1cfacfa441846b9b99001010cb8fbb02130e6cfdb25cea36d3e98e87" +"checksum actix-rt 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "168620aaf00fcd2a16e621790abaf180ef7377c2f8355b4ca5775d6afc778ed8" "checksum actix-server 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb3038e9e457e0a498ea682723e0f4e6cc2c4f362a1868d749808355275ad959" "checksum actix-server-config 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "483a34989c682d93142bacad6300375bb6ad8002d2e0bb249dbad86128b9ff30" "checksum actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bca5b48e928841ff7e7dce1fdb5b0d4582f6b1b976e08f4bac3f640643e0773f" @@ -3207,21 +3196,21 @@ dependencies = [ "checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" "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 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)" = "5180c5a20655b14a819b652fd2378fa5f1697b6c9ddad3e695c2f9cedf6df4e2" "checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" "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 bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" "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 bstr 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94cdf78eb7e94c566c1f5dbe2abf8fc70a548fc902942a48c4b3a98b48ca9ade" +"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" "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 bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -"checksum cc 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" +"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" +"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" @@ -3232,7 +3221,6 @@ dependencies = [ "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" "checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -"checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13" "checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" "checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" @@ -3245,15 +3233,15 @@ dependencies = [ "checksum deunicode 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" -"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" +"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" "checksum elasticlunr-rs 2.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f66a620976c38dbbbcd6355910432cef8b0911b3af86332029752379f0ff7924" -"checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed" +"checksum encoding_rs 0.8.19 (registry+https://github.com/rust-lang/crates.io-index)" = "79906e1ad1f7f8bc48864fcc6ffd58336fb5992e627bf61928099cb25fdf4314" "checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d" "checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" "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 fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -"checksum filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f8c63033fcba1f51ef744505b3cad42510432b904c062afa67ad7ece008429d" +"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469" "checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" @@ -3265,11 +3253,11 @@ dependencies = [ "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" -"checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" +"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -"checksum getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "fc344b02d3868feb131e8b5fe2b9b0a1cc42942679af493061fc13b853243872" +"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" "checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" @@ -3283,14 +3271,14 @@ dependencies = [ "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" "checksum humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" -"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" -"checksum hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)" = "7cb44cbce9d8ee4fb36e4c0ad7b794ac44ebaad924b9c8291a63215bb44c2c8f" +"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" "checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" "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 ignore 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7" -"checksum image 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)" = "663a975007e0b49903e2e8ac0db2c432c465855f2d65f17883ba1476e85f0b42" -"checksum indexmap 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4d6d89e0948bf10c08b9ecc8ac5b83f07f857ebe2c0cbe38de15b4e4f510356" +"checksum image 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ee0665404aa0f2ad154021777b785878b0e5b1c1da030455abc3d9ed257c2c67" +"checksum indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a61202fbe46c4a951e9404a720a0180bcf3212c750d735cb5c4ba4dc551299f3" "checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" "checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718" "checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" @@ -3316,7 +3304,7 @@ dependencies = [ "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 memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" -"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" +"checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf" "checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" "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" @@ -3330,7 +3318,7 @@ dependencies = [ "checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -"checksum notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "3572d71f13ea8ed41867accd971fd564aa75934cf7a1fae03ddb8c74a8a49943" +"checksum notify 4.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1191efa2b8fe041decb55c238a125b7a1aeb6fad7a525133a02be5ec949ff3cb" "checksum num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" "checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" @@ -3351,28 +3339,28 @@ dependencies = [ "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "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.1 (registry+https://github.com/rust-lang/crates.io-index)" = "933085deae3f32071f135d799d75667b63c8dc1f4537159756e3d4ceab41868c" +"checksum pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a" "checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -"checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646" -"checksum pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f249ea6de7c7b7aba92b4ff4376a994c6dbd98fd2166c89d5c4947397ecb574d" +"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 phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" +"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea" "checksum plist 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a9f075f6394100e7c105ed1af73fb1859d6fd14e49d4290d578120beb167f" "checksum png 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8422b27bb2c013dd97b9aef69e161ce262236f49aaf46a0489011c8ff0264602" "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -"checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802" +"checksum proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8" "checksum publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9bf259a81de2b2eb9850ec990ec78e6a25319715584fd7652b9b26f96fcb1510" "checksum pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85b0ad0d4c1702965ee6bb5b4ff5e71f83850b497d497e9444302987bf9e26a4" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "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 rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" +"checksum rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "59cea0d944b32347a1863e95942fd6ebdb486afb4f038119494f2860380c1d51" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" @@ -3385,13 +3373,13 @@ dependencies = [ "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -"checksum rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4b0186e22767d5b9738a05eab7c6ac90b15db17e5b5f9bd87976dd7d89a10a4" -"checksum rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe0df8435ac0c397d467b6cad6d25543d06e8a019ef3f6af3c384597515bd2" +"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" +"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" "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 regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26" +"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" "checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9" -"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" +"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" "checksum reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0f6d896143a583047512e59ac54a215cb203c29cc941917343edea3be8df9c78" "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb" @@ -3411,8 +3399,8 @@ dependencies = [ "checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"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 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" +"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" "checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" @@ -3422,14 +3410,14 @@ dependencies = [ "checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -"checksum slotmap 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4ed041f7f2ff35f2bf7d688bf30686976512f8300e37433c2c73ea9f4cf14b" +"checksum slotmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c46a3482db8f247956e464d783693ece164ca056e6e67563ee5505bdb86452cd" "checksum slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" "checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423" -"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da" +"checksum string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" @@ -3459,7 +3447,7 @@ dependencies = [ "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" "checksum tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19" "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" -"checksum tokio-udp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "56775b287cda0fd8ca0c5d2f5b1d0646afbd360101e2eef91cd89365fcfc2f5f" +"checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b" "checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724" "checksum trust-dns-proto 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5559ebdf6c2368ddd11e20b11d6bbaf9e46deb803acd7815e93f5a7b4a6d2901" "checksum trust-dns-resolver 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9992e58dba365798803c0b91018ff6c8d3fc77e06977c4539af2a6bfe0a039" @@ -3493,7 +3481,7 @@ dependencies = [ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" "checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" +"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" "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" diff --git a/components/library/Cargo.toml b/components/library/Cargo.toml index 41cc036..b2923bf 100644 --- a/components/library/Cargo.toml +++ b/components/library/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Vincent Prouillet "] [dependencies] -slotmap = "0.2" +slotmap = "0.4" rayon = "1" chrono = { version = "0.4", features = ["serde"] } tera = "1.0.0-beta.10" diff --git a/components/library/src/content/page.rs b/components/library/src/content/page.rs index 4b59096..b3ca3cd 100644 --- a/components/library/src/content/page.rs +++ b/components/library/src/content/page.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use std::path::{Path, PathBuf}; use regex::Regex; -use slotmap::Key; +use slotmap::DefaultKey; use slug::slugify; use tera::{Context as TeraContext, Tera}; @@ -35,7 +35,7 @@ pub struct Page { /// The front matter meta-data pub meta: PageFrontMatter, /// The list of parent sections - pub ancestors: Vec, + pub ancestors: Vec, /// The actual content of the page, in markdown pub raw_content: String, /// All the non-md files we found next to the .md file @@ -58,13 +58,13 @@ pub struct Page { /// as summary pub summary: Option, /// The earlier page, for pages sorted by date - pub earlier: Option, + pub earlier: Option, /// The later page, for pages sorted by date - pub later: Option, + pub later: Option, /// The lighter page, for pages sorted by weight - pub lighter: Option, + pub lighter: Option, /// The heavier page, for pages sorted by weight - pub heavier: Option, + pub heavier: Option, /// Toc made from the headings of the markdown file pub toc: Vec, /// How many words in the raw content @@ -76,7 +76,7 @@ pub struct Page { /// Corresponds to the lang in the {slug}.{lang}.md file scheme pub lang: String, /// Contains all the translated version of that page - pub translations: Vec, + pub translations: Vec, /// Contains the internal links that have an anchor: we can only check the anchor /// after all pages have been built and their ToC compiled. The page itself should exist otherwise /// it would have errored before getting there diff --git a/components/library/src/content/section.rs b/components/library/src/content/section.rs index b23d40f..b8b12ad 100644 --- a/components/library/src/content/section.rs +++ b/components/library/src/content/section.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use std::path::{Path, PathBuf}; -use slotmap::Key; +use slotmap::DefaultKey; use tera::{Context as TeraContext, Tera}; use config::Config; @@ -38,13 +38,13 @@ pub struct Section { /// All the non-md files we found next to the .md file as string for use in templates pub serialized_assets: Vec, /// All direct pages of that section - pub pages: Vec, + pub pages: Vec, /// All pages that cannot be sorted in this section - pub ignored_pages: Vec, + pub ignored_pages: Vec, /// The list of parent sections - pub ancestors: Vec, + pub ancestors: Vec, /// All direct subsections - pub subsections: Vec, + pub subsections: Vec, /// Toc made from the headings of the markdown file pub toc: Vec, /// How many words in the raw content @@ -56,7 +56,7 @@ pub struct Section { /// Corresponds to the lang in the _index.{lang}.md file scheme pub lang: String, /// Contains all the translated version of that section - pub translations: Vec, + pub translations: Vec, /// Contains the internal links that have an anchor: we can only check the anchor /// after all pages have been built and their ToC compiled. The page itself should exist otherwise /// it would have errored before getting there diff --git a/components/library/src/library.rs b/components/library/src/library.rs index e29f1b8..e4d16e2 100644 --- a/components/library/src/library.rs +++ b/components/library/src/library.rs @@ -1,7 +1,7 @@ use std::collections::{HashMap, HashSet}; use std::path::{Path, PathBuf}; -use slotmap::{DenseSlotMap, Key}; +use slotmap::{DenseSlotMap, DefaultKey}; use front_matter::SortBy; @@ -19,13 +19,13 @@ use sorting::{find_siblings, sort_pages_by_date, sort_pages_by_weight}; #[derive(Debug)] pub struct Library { /// All the pages of the site - pages: DenseSlotMap, + pages: DenseSlotMap, /// All the sections of the site - sections: DenseSlotMap
, + sections: DenseSlotMap, /// A mapping path -> key for pages so we can easily get their key - pub paths_to_pages: HashMap, + pub paths_to_pages: HashMap, /// A mapping path -> key for sections so we can easily get their key - pub paths_to_sections: HashMap, + pub paths_to_sections: HashMap, /// Whether we need to look for translations is_multilingual: bool, } @@ -42,7 +42,7 @@ impl Library { } /// Add a section and return its Key - pub fn insert_section(&mut self, section: Section) -> Key { + pub fn insert_section(&mut self, section: Section) -> DefaultKey { let path = section.file.path.clone(); let key = self.sections.insert(section); self.paths_to_sections.insert(path, key); @@ -50,18 +50,18 @@ impl Library { } /// Add a page and return its Key - pub fn insert_page(&mut self, page: Page) -> Key { + pub fn insert_page(&mut self, page: Page) -> DefaultKey { let path = page.file.path.clone(); let key = self.pages.insert(page); self.paths_to_pages.insert(path, key); key } - pub fn pages(&self) -> &DenseSlotMap { + pub fn pages(&self) -> &DenseSlotMap { &self.pages } - pub fn pages_mut(&mut self) -> &mut DenseSlotMap { + pub fn pages_mut(&mut self) -> &mut DenseSlotMap { &mut self.pages } @@ -69,11 +69,11 @@ impl Library { self.pages.values().collect::>() } - pub fn sections(&self) -> &DenseSlotMap
{ + pub fn sections(&self) -> &DenseSlotMap { &self.sections } - pub fn sections_mut(&mut self) -> &mut DenseSlotMap
{ + pub fn sections_mut(&mut self) -> &mut DenseSlotMap { &mut self.sections } @@ -336,7 +336,7 @@ impl Library { } /// Only used in tests - pub fn get_section_key>(&self, path: P) -> Option<&Key> { + pub fn get_section_key>(&self, path: P) -> Option<&DefaultKey> { self.paths_to_sections.get(path.as_ref()) } @@ -349,15 +349,15 @@ impl Library { .get_mut(self.paths_to_sections.get(path.as_ref()).cloned().unwrap_or_default()) } - pub fn get_section_by_key(&self, key: Key) -> &Section { + pub fn get_section_by_key(&self, key: DefaultKey) -> &Section { self.sections.get(key).unwrap() } - pub fn get_section_mut_by_key(&mut self, key: Key) -> &mut Section { + pub fn get_section_mut_by_key(&mut self, key: DefaultKey) -> &mut Section { self.sections.get_mut(key).unwrap() } - pub fn get_section_path_by_key(&self, key: Key) -> &str { + pub fn get_section_path_by_key(&self, key: DefaultKey) -> &str { &self.get_section_by_key(key).file.relative } @@ -365,11 +365,11 @@ impl Library { self.pages.get(self.paths_to_pages.get(path.as_ref()).cloned().unwrap_or_default()) } - pub fn get_page_by_key(&self, key: Key) -> &Page { + pub fn get_page_by_key(&self, key: DefaultKey) -> &Page { self.pages.get(key).unwrap() } - pub fn get_page_mut_by_key(&mut self, key: Key) -> &mut Page { + pub fn get_page_mut_by_key(&mut self, key: DefaultKey) -> &mut Page { self.pages.get_mut(key).unwrap() } diff --git a/components/library/src/pagination/mod.rs b/components/library/src/pagination/mod.rs index d6091c4..6a848f8 100644 --- a/components/library/src/pagination/mod.rs +++ b/components/library/src/pagination/mod.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use slotmap::Key; +use slotmap::DefaultKey; use tera::{to_value, Context, Tera, Value}; use config::Config; @@ -44,7 +44,7 @@ impl<'a> Pager<'a> { #[derive(Clone, Debug, PartialEq)] pub struct Paginator<'a> { /// All pages in the section/taxonomy - all_pages: &'a [Key], + all_pages: &'a [DefaultKey], /// Pages split in chunks of `paginate_by` pub pagers: Vec>, /// How many content pages on a paginated page at max diff --git a/components/library/src/sorting.rs b/components/library/src/sorting.rs index 2df1ade..a666a91 100644 --- a/components/library/src/sorting.rs +++ b/components/library/src/sorting.rs @@ -2,7 +2,7 @@ use std::cmp::Ordering; use chrono::NaiveDateTime; use rayon::prelude::*; -use slotmap::Key; +use slotmap::DefaultKey; use content::Page; @@ -21,7 +21,7 @@ pub fn sort_actual_pages_by_date(a: &&Page, b: &&Page) -> Ordering { /// Takes a list of (page key, date, permalink) and sort them by dates if possible /// Pages without date will be put in the unsortable bucket /// The permalink is used to break ties -pub fn sort_pages_by_date(pages: Vec<(&Key, Option, &str)>) -> (Vec, Vec) { +pub fn sort_pages_by_date(pages: Vec<(&DefaultKey, Option, &str)>) -> (Vec, Vec) { let (mut can_be_sorted, cannot_be_sorted): (Vec<_>, Vec<_>) = pages.into_par_iter().partition(|page| page.1.is_some()); @@ -40,7 +40,7 @@ pub fn sort_pages_by_date(pages: Vec<(&Key, Option, &str)>) -> (V /// Takes a list of (page key, weight, permalink) and sort them by weight if possible /// Pages without weight will be put in the unsortable bucket /// The permalink is used to break ties -pub fn sort_pages_by_weight(pages: Vec<(&Key, Option, &str)>) -> (Vec, Vec) { +pub fn sort_pages_by_weight(pages: Vec<(&DefaultKey, Option, &str)>) -> (Vec, Vec) { let (mut can_be_sorted, cannot_be_sorted): (Vec<_>, Vec<_>) = pages.into_par_iter().partition(|page| page.1.is_some()); @@ -57,7 +57,7 @@ pub fn sort_pages_by_weight(pages: Vec<(&Key, Option, &str)>) -> (Vec Vec<(Key, Option, Option)> { +pub fn find_siblings(sorted: &[DefaultKey]) -> Vec<(DefaultKey, Option, Option)> { let mut res = Vec::with_capacity(sorted.len()); let length = sorted.len(); diff --git a/components/library/src/taxonomies/mod.rs b/components/library/src/taxonomies/mod.rs index f355124..8805af4 100644 --- a/components/library/src/taxonomies/mod.rs +++ b/components/library/src/taxonomies/mod.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use slotmap::Key; +use slotmap::DefaultKey; use slug::slugify; use tera::{Context, Tera}; @@ -44,7 +44,7 @@ pub struct TaxonomyItem { pub name: String, pub slug: String, pub permalink: String, - pub pages: Vec, + pub pages: Vec, } impl TaxonomyItem { @@ -52,7 +52,7 @@ impl TaxonomyItem { name: &str, taxonomy: &TaxonomyConfig, config: &Config, - keys: Vec, + keys: Vec, library: &Library, ) -> Self { // Taxonomy are almost always used for blogs so we filter by dates @@ -113,7 +113,7 @@ impl Taxonomy { fn new( kind: TaxonomyConfig, config: &Config, - items: HashMap>, + items: HashMap>, library: &Library, ) -> Taxonomy { let mut sorted_items = vec![]; From b16d525134ce8a50adbad6f2f2d04e10945674ec Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Mon, 16 Sep 2019 11:46:17 +0200 Subject: [PATCH 64/67] Mention feed_url in docs --- docs/content/documentation/templates/rss.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/content/documentation/templates/rss.md b/docs/content/documentation/templates/rss.md index 8d1513c..8be0a24 100644 --- a/docs/content/documentation/templates/rss.md +++ b/docs/content/documentation/templates/rss.md @@ -10,8 +10,9 @@ directory or, if one does not exist, will use the use the built-in rss template. **Only pages with a date will be available.** -The RSS template gets two variables in addition of the config: +The RSS template gets three variables in addition of the config: +- `feed_url`: the full url to that specific feed - `last_build_date`: the date of the latest post - `pages`: see [the page variables](@/documentation/templates/pages-sections.md#page-variables) for a detailed description of what this contains From f96aad2fddbdfb2936d3f5edd2d687f58cbf61ca Mon Sep 17 00:00:00 2001 From: Arne Beer Date: Wed, 25 Sep 2019 01:54:14 +0200 Subject: [PATCH 65/67] Only shrink when resizing with fit (#803) --- components/imageproc/src/lib.rs | 12 +++++++++--- .../content/image-processing/index.md | 8 +++++++- .../processed_images/e8e628f3be10e77c00.png | Bin 0 -> 136871 bytes 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 docs/static/processed_images/e8e628f3be10e77c00.png diff --git a/components/imageproc/src/lib.rs b/components/imageproc/src/lib.rs index b1f5827..7c754b5 100644 --- a/components/imageproc/src/lib.rs +++ b/components/imageproc/src/lib.rs @@ -41,8 +41,8 @@ pub enum ResizeOp { /// Scales the image to a specified height with width computed such /// that aspect ratio is preserved FitHeight(u32), - /// Scales the image such that it fits within the specified width and - /// height preserving aspect ratio. + /// If the image is larger than the specified width or height, scales the image such + /// that it fits within the specified width and height preserving aspect ratio. /// Either dimension may end up being smaller, but never larger than specified. Fit(u32, u32), /// Scales the image such that it fills the specified width and height. @@ -266,7 +266,13 @@ impl ImageOp { Scale(w, h) => img.resize_exact(w, h, RESIZE_FILTER), FitWidth(w) => img.resize(w, u32::max_value(), RESIZE_FILTER), FitHeight(h) => img.resize(u32::max_value(), h, RESIZE_FILTER), - Fit(w, h) => img.resize(w, h, RESIZE_FILTER), + Fit(w, h) => { + if img_w > w || img_h > h { + img.resize(w, h, RESIZE_FILTER) + } else { + img + } + }, Fill(w, h) => { let factor_w = img_w as f32 / w as f32; let factor_h = img_h as f32 / h as f32; diff --git a/docs/content/documentation/content/image-processing/index.md b/docs/content/documentation/content/image-processing/index.md index 8dbb281..c6973af 100644 --- a/docs/content/documentation/content/image-processing/index.md +++ b/docs/content/documentation/content/image-processing/index.md @@ -78,10 +78,16 @@ The source for all examples is this 300 × 380 pixels image: {{ resize_image(path="documentation/content/image-processing/01-zola.png", width=0, height=150, op="fit_height") }} ### **`"fit"`** - Like `"fit_width"` and `"fit_height"` combined. + Like `"fit_width"` and `"fit_height"` combined, but only resize if the image is bigger than any of the specified dimensions. + This mode is handy, if e.g. images are automatically shrinked to certain sizes in a shortcode for mobile optimization. Resizes the image such that the result fits within `width` and `height` preserving aspect ratio. This means that both width or height will be at max `width` and `height`, respectively, but possibly one of them smaller so as to preserve the aspect ratio. + + `resize_image(..., width=5000, height=5000, op="fit")` + + {{ resize_image(path="documentation/content/image-processing/01-zola.png", width=5000, height=5000, op="fit") }} + `resize_image(..., width=150, height=150, op="fit")` {{ resize_image(path="documentation/content/image-processing/01-zola.png", width=150, height=150, op="fit") }} diff --git a/docs/static/processed_images/e8e628f3be10e77c00.png b/docs/static/processed_images/e8e628f3be10e77c00.png new file mode 100644 index 0000000000000000000000000000000000000000..4cf656b6cdc4cd3f172dcb67ba2800660319f7cc GIT binary patch literal 136871 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�f}D9{sX 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 literal 0 HcmV?d00001 From 35b567742c5f0d1eac36fc9be499dc1109908d1d Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Tue, 24 Sep 2019 19:12:13 -0700 Subject: [PATCH 66/67] Ready for release --- CHANGELOG.md | 3 +- Cargo.lock | 198 ++++++++++-------- .../documentation/deployment/github-pages.md | 2 +- .../documentation/deployment/gitlab-pages.md | 2 +- .../documentation/deployment/netlify.md | 2 +- 5 files changed, 114 insertions(+), 93 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf53885..8490dc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # Changelog -## 0.9.0 (unreleased) +## 0.9.0 (2019-09-24) ### Breaking - Add `--drafts` flag to `build`, `serve` and `check` to load drafts. Drafts are never loaded by default anymore +- Using `fit` in `resize_image` on an image smaller than the given height/width is now a no-op and will not upscale images anymore ### Other - Add `--open` flag to open server URL in default browser diff --git a/Cargo.lock b/Cargo.lock index ef82d66..df5fef3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,7 +39,7 @@ dependencies = [ "actix-http 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web 1.0.7 (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.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -62,13 +62,13 @@ dependencies = [ "actix-threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (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.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding_rs 0.8.19 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -80,7 +80,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (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.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", @@ -206,7 +206,7 @@ dependencies = [ "actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding_rs 0.8.19 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -232,7 +232,7 @@ dependencies = [ [[package]] name = "adler32" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -248,7 +248,7 @@ name = "ammonia" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "html5ever 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -266,7 +266,7 @@ dependencies = [ [[package]] name = "arc-swap" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -293,11 +293,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "backtrace" -version = "0.3.37" +version = "0.3.38" 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)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "bincode" -version = "1.1.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -331,7 +331,7 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -400,7 +400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cfg-if" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -415,6 +415,15 @@ dependencies = [ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "chrono-tz" +version = "0.5.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)", + "parse-zoneinfo 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "clap" version = "2.33.0" @@ -422,7 +431,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.13 (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.0 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -434,7 +443,7 @@ 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)", + "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -507,7 +516,7 @@ 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]] @@ -533,7 +542,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "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)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -553,7 +562,7 @@ name = "crossbeam-utils" version = "0.6.6" 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)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -591,7 +600,7 @@ name = "deflate" version = "0.7.20" 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)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -648,10 +657,10 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.19" +version = "0.8.20" 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]] @@ -669,7 +678,7 @@ name = "error-chain" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -679,7 +688,7 @@ version = "0.1.0" dependencies = [ "image 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -688,7 +697,7 @@ name = "failure" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -713,7 +722,7 @@ name = "filetime" version = "0.2.7" 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)", "libc 0.2.62 (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)", @@ -758,7 +767,7 @@ dependencies = [ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -773,7 +782,7 @@ name = "fsevent" version = "0.4.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.0 (registry+https://github.com/rust-lang/crates.io-index)", "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -795,7 +804,7 @@ name = "fuchsia-zircon" version = "0.3.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)", + "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -848,14 +857,14 @@ name = "getrandom" version = "0.1.12" 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)", "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)", ] [[package]] name = "gif" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -929,15 +938,15 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "markup5ever 0.9.0 (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)", - "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.4 (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)", ] [[package]] @@ -1063,7 +1072,7 @@ version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", "jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1082,7 +1091,7 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -1096,7 +1105,7 @@ name = "inflate" version = "0.4.5" 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]] @@ -1104,7 +1113,7 @@ name = "inotify" version = "0.6.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)", + "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1198,7 +1207,7 @@ dependencies = [ "slotmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -1247,7 +1256,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]] @@ -1338,7 +1347,7 @@ name = "miniz_oxide" version = "0.3.2" 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]] @@ -1401,7 +1410,7 @@ dependencies = [ "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", - "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1412,7 +1421,7 @@ name = "net2" version = "0.2.33" 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)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1427,9 +1436,9 @@ name = "nix" version = "0.14.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)", + "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "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)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1453,7 +1462,7 @@ name = "notify" version = "4.0.13" 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.0 (registry+https://github.com/rust-lang/crates.io-index)", "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1526,7 +1535,7 @@ name = "onig" version = "4.3.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)", + "bitflags 1.2.0 (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)", "onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1559,8 +1568,8 @@ name = "openssl" version = "0.10.24" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.1.0 (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.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (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)", @@ -1628,7 +1637,7 @@ name = "parking_lot_core" version = "0.6.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)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1637,6 +1646,14 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "parse-zoneinfo" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "percent-encoding" version = "1.0.1" @@ -1671,7 +1688,7 @@ 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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.4 (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)", ] @@ -1743,7 +1760,7 @@ name = "png" version = "0.15.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.0 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1769,7 +1786,7 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.3" +version = "1.0.4" 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)", @@ -1792,7 +1809,7 @@ name = "pulldown-cmark" version = "0.6.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.0 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1816,7 +1833,7 @@ name = "quote" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1839,7 +1856,7 @@ dependencies = [ [[package]] name = "rand" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2049,7 +2066,7 @@ dependencies = [ "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", - "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -2062,7 +2079,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding_rs 0.8.19 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2157,7 +2174,7 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.15" +version = "0.1.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)", @@ -2235,7 +2252,7 @@ name = "serde_derive" version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.4 (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)", ] @@ -2303,7 +2320,7 @@ name = "signal-hook-registry" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arc-swap 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2330,7 +2347,7 @@ dependencies = [ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "templates 0.1.0", - "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", ] @@ -2362,7 +2379,7 @@ name = "socket2" version = "0.3.11" 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)", "libc 0.2.62 (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)", @@ -2402,7 +2419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2448,7 +2465,7 @@ name = "syn" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2469,8 +2486,8 @@ name = "syntect" version = "3.2.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)", + "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.11 (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)", @@ -2490,9 +2507,9 @@ name = "tempfile" version = "3.1.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)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2513,7 +2530,7 @@ dependencies = [ "pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.20 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "utils 0.1.0", @@ -2531,13 +2548,15 @@ dependencies = [ [[package]] name = "tera" -version = "1.0.0-beta.14" +version = "1.0.0-beta.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono-tz 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "globwalk 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2545,7 +2564,6 @@ dependencies = [ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "unic-segment 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2801,7 +2819,7 @@ name = "trust-dns-resolver" version = "0.11.1" 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)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2824,7 +2842,7 @@ name = "try_from" version = "0.3.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)", ] [[package]] @@ -2957,7 +2975,7 @@ dependencies = [ "errors 0.1.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)", + "tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2995,7 +3013,7 @@ name = "v_htmlescape" version = "0.4.5" 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)", "v_escape 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3188,19 +3206,19 @@ dependencies = [ "checksum actix-utils 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6ea501068a0173533704be321f149853f702d9e3c3ce9d57e7a96d94b1ab5aca" "checksum actix-web 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ced216f53d465f9d6478454b2b994d1fe91ec203ac9d056837cbe07e823cb83" "checksum actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe9e3cdec1e645b675f354766e0688c5705021c85ab3cf739be1c8999b91c76" -"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" +"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" "checksum ammonia 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9e266e1f4be5ffa05309f650e2586fe1d3ae6034eb24025a7ae1dfecc330823a" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum arc-swap 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "854ede29f7a0ce90519fb2439d030320c6201119b87dab0ee96044603e1130b9" +"checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" "checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" "checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" -"checksum backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)" = "5180c5a20655b14a819b652fd2378fa5f1697b6c9ddad3e695c2f9cedf6df4e2" +"checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5" "checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" "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 bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +"checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92" +"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2" "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 bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" @@ -3209,8 +3227,9 @@ dependencies = [ "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" "checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" -"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" +"checksum chrono-tz 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e0e430fad0384e4defc3dc6b1223d1b886087a8bf9b7080e5ae027f73851ea15" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" @@ -3235,7 +3254,7 @@ dependencies = [ "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" "checksum elasticlunr-rs 2.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f66a620976c38dbbbcd6355910432cef8b0911b3af86332029752379f0ff7924" -"checksum encoding_rs 0.8.19 (registry+https://github.com/rust-lang/crates.io-index)" = "79906e1ad1f7f8bc48864fcc6ffd58336fb5992e627bf61928099cb25fdf4314" +"checksum encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)" = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9" "checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d" "checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" @@ -3258,7 +3277,7 @@ dependencies = [ "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" "checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" -"checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568" +"checksum gif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" "checksum globwalk 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "53cbcf0368596897b0a3b8ff2110acf2400e80ffad4ca9238b52ff282a9b267b" @@ -3266,7 +3285,7 @@ dependencies = [ "checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e" -"checksum html5ever 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a62c2cb2d34faa27dea3f2380ee8b06b8ff9c18e1cd5358e1da20b51089f4f1" +"checksum html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb" "checksum http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "372bcb56f939e449117fb0869c2e8fd8753a8223d92a172c6e808cf123a5b6e4" "checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" @@ -3337,6 +3356,7 @@ dependencies = [ "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +"checksum parse-zoneinfo 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "089a398ccdcdd77b8c38909d5a1e4b67da1bc4c9dbfe6d5b536c828eddb779e5" "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" @@ -3353,14 +3373,14 @@ dependencies = [ "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -"checksum proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8" +"checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc" "checksum publicsuffix 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9bf259a81de2b2eb9850ec990ec78e6a25319715584fd7652b9b26f96fcb1510" "checksum pulldown-cmark 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85b0ad0d4c1702965ee6bb5b4ff5e71f83850b497d497e9444302987bf9e26a4" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "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 rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -"checksum rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "59cea0d944b32347a1863e95942fd6ebdb486afb4f038119494f2860380c1d51" +"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" @@ -3391,7 +3411,7 @@ dependencies = [ "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" "checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd" "checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972" -"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" +"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" @@ -3428,7 +3448,7 @@ dependencies = [ "checksum syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" -"checksum tera 1.0.0-beta.14 (registry+https://github.com/rust-lang/crates.io-index)" = "a40589dd4e1d2c20d2eac3bfb3cef560bf86bd8591bad697e6e09bb4f248e8f6" +"checksum tera 1.0.0-beta.16 (registry+https://github.com/rust-lang/crates.io-index)" = "e0fa13465ab85540a4d069fbe9c76af96e78ef83046af4ed54e7be33ef98c3eb" "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" "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" diff --git a/docs/content/documentation/deployment/github-pages.md b/docs/content/documentation/deployment/github-pages.md index b9a60a2..dd50ac5 100644 --- a/docs/content/documentation/deployment/github-pages.md +++ b/docs/content/documentation/deployment/github-pages.md @@ -52,7 +52,7 @@ language: minimal before_script: # Download and unzip the zola executable # Replace the version numbers in the URL by the version you want to use - - curl -s -L https://github.com/getzola/zola/releases/download/v0.8.0/zola-v0.8.0-x86_64-unknown-linux-gnu.tar.gz | sudo tar xvzf - -C /usr/local/bin + - curl -s -L https://github.com/getzola/zola/releases/download/v0.9.0/zola-v0.9.0-x86_64-unknown-linux-gnu.tar.gz | sudo tar xvzf - -C /usr/local/bin script: - zola build diff --git a/docs/content/documentation/deployment/gitlab-pages.md b/docs/content/documentation/deployment/gitlab-pages.md index 090abf2..8bcde42 100644 --- a/docs/content/documentation/deployment/gitlab-pages.md +++ b/docs/content/documentation/deployment/gitlab-pages.md @@ -41,7 +41,7 @@ variables: # This variable will ensure that the CI runner pulls in your theme from the submodule GIT_SUBMODULE_STRATEGY: recursive # Specify the zola version you want to use here - ZOLA_VERSION: "v0.8.0" + ZOLA_VERSION: "v0.9.0" pages: script: diff --git a/docs/content/documentation/deployment/netlify.md b/docs/content/documentation/deployment/netlify.md index b903b72..a8557b9 100644 --- a/docs/content/documentation/deployment/netlify.md +++ b/docs/content/documentation/deployment/netlify.md @@ -38,7 +38,7 @@ command = "zola build" [build.environment] # Set the version name that you want to use and Netlify will automatically use it -ZOLA_VERSION = "0.8.0" +ZOLA_VERSION = "0.9.0" # The magic for deploying previews of branches # We need to override the base url with whatever url Netlify assigns to our From b4a31df73eeb355b082198ef23214b342142e92e Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Fri, 27 Sep 2019 20:18:37 -0700 Subject: [PATCH 67/67] Change release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8490dc6..01611aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 0.9.0 (2019-09-24) +## 0.9.0 (2019-09-28) ### Breaking