Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-01-05 17:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #2961 #2965

Browse source 
2961: Pin the zola version used to deploy the site r=epage a=pksunkara



2965: fix(error): Never show unrequested color r=pksunkara a=epage



Co-authored-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Co-authored-by: Ed Page <eopage@gmail.com>
This commit is contained in:
bors[bot] 2021-10-29 23:00:12 +00:00 committed by GitHub
commit 2ce916133b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/site.yml vendored
View file

@ -2,7 +2,9 @@ name: Site
on: on:
push: push:
branches: [master] branches: [master]
paths: ["site/**"] paths:
- site/**
- .github/workflows/site.yml
concurrency: concurrency:
group: site group: site
cancel-in-progress: true cancel-in-progress: true
@ -14,13 +16,13 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Build - name: Build
uses: shalzz/zola-deploy-action@master uses: shalzz/zola-deploy-action@v0.14.1
env: env:
BUILD_DIR: site BUILD_DIR: site
BUILD_ONLY: true BUILD_ONLY: true
- name: Deploy - name: Deploy
if: ${{ success() }} if: ${{ success() }}
uses: JamesIves/github-pages-deploy-action@4.1.0 uses: JamesIves/github-pages-deploy-action@4.1.5
with: with:
branch: gh-pages branch: gh-pages
folder: site/public folder: site/public

4
src/parse/errors.rs
View file

@ -870,7 +870,7 @@ impl Error {
val: String, val: String,
err: Box<dyn error::Error + Send + Sync>, err: Box<dyn error::Error + Send + Sync>,
) -> Self { ) -> Self {
Self::value_validation_with_color(arg, val, err, ColorChoice::Auto) Self::value_validation_with_color(arg, val, err, ColorChoice::Never)
} }
fn value_validation_with_color( fn value_validation_with_color(
@ -996,7 +996,7 @@ impl Error {
} }
pub(crate) fn argument_not_found_auto(arg: String) -> Self { pub(crate) fn argument_not_found_auto(arg: String) -> Self {
let mut c = Colorizer::new(true, ColorChoice::Auto); let mut c = Colorizer::new(true, ColorChoice::Never);
start_error(&mut c, "The argument '"); start_error(&mut c, "The argument '");
c.warning(arg.clone()); c.warning(arg.clone());