diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..4a6a1abd --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[resolver] +incompatible-rust-versions = "fallback" diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 7ab13b9f..27749d4b 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -9,13 +9,13 @@ customManagers: [ { customType: 'regex', - fileMatch: [ - '^rust-toolchain\\.toml$', - 'Cargo.toml$', - 'clippy.toml$', - '\\.clippy.toml$', - '^\\.github/workflows/ci.yml$', - '^\\.github/workflows/rust-next.yml$', + managerFilePatterns: [ + '/^rust-toolchain\\.toml$/', + '/Cargo.toml$/', + '/clippy.toml$/', + '/\\.clippy.toml$/', + '/^\\.github/workflows/ci.yml$/', + '/^\\.github/workflows/rust-next.yml$/', ], matchStrings: [ 'STABLE.*?(?\\d+\\.\\d+(\\.\\d+)?)', diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f5cfc94..5ef69814 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,7 @@ jobs: - name: Build run: cargo test --workspace --no-run - name: Test - run: cargo hack test --feature-powerset --workspace + run: cargo hack test --each-feature --workspace msrv: name: "Check MSRV" strategy: @@ -68,7 +68,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - uses: taiki-e/install-action@cargo-hack - name: Default features - run: cargo hack check --feature-powerset --locked --rust-version --ignore-private --workspace + run: cargo hack check --each-feature --locked --rust-version --ignore-private --workspace --keep-going minimal-versions: name: Minimal versions runs-on: ubuntu-latest @@ -86,7 +86,7 @@ jobs: - name: Downgrade dependencies to minimal versions run: cargo +nightly generate-lockfile -Z minimal-versions - name: Compile with minimal versions - run: cargo +stable check --workspace --all-features --locked + run: cargo +stable check --workspace --all-features --locked --keep-going lockfile: runs-on: ubuntu-latest steps: @@ -113,7 +113,7 @@ jobs: - name: Check documentation env: RUSTDOCFLAGS: -D warnings - run: cargo doc --workspace --all-features --no-deps --document-private-items + run: cargo doc --workspace --all-features --no-deps --document-private-items --keep-going rustfmt: name: rustfmt runs-on: ubuntu-latest @@ -159,7 +159,7 @@ jobs: sarif_file: clippy-results.sarif wait-for-processing: true - name: Report status - run: cargo clippy --workspace --all-features --all-targets -- -D warnings --allow deprecated + run: cargo clippy --workspace --all-features --all-targets --keep-going -- -D warnings --allow deprecated coverage: name: Coverage runs-on: ubuntu-latest diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml index 0cfa1800..1bb1064d 100644 --- a/.github/workflows/rust-next.yml +++ b/.github/workflows/rust-next.yml @@ -41,7 +41,7 @@ jobs: - name: Build run: cargo test --workspace --no-run - name: Test - run: cargo hack test --feature-powerset --workspace + run: cargo hack test --each-feature --workspace latest: name: "Check latest dependencies" runs-on: ubuntu-latest @@ -60,4 +60,4 @@ jobs: - name: Build run: cargo test --workspace --no-run - name: Test - run: cargo hack test --feature-powerset --workspace + run: cargo hack test --each-feature --workspace diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 68db968e..656c68ec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,26 +1,19 @@ +default_install_hook_types: ["pre-commit", "commit-msg"] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v5.0.0 hooks: - id: check-yaml - stages: [commit] - id: check-json - stages: [commit] - id: check-toml - stages: [commit] - id: check-merge-conflict - stages: [commit] - id: check-case-conflict - stages: [commit] - id: detect-private-key - stages: [commit] - repo: https://github.com/crate-ci/typos - rev: v1.16.20 + rev: v1.32.0 hooks: - id: typos - stages: [commit] - repo: https://github.com/crate-ci/committed - rev: v1.0.20 + rev: v1.1.7 hooks: - id: committed - stages: [commit-msg] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9e6a3453..b9b5a8d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,18 +7,18 @@ appreciate any level you're willing to do. Need some new functionality to help? You can let us know by opening an [issue][new issue]. It's helpful to look through [all issues][all issues] in -case its already being talked about. +case it's already being talked about. ## Bug Reports Please let us know about what problems you run into, whether in behavior or ergonomics of API. You can do this by opening an [issue][new issue]. It's -helpful to look through [all issues][all issues] in case its already being +helpful to look through [all issues][all issues] in case it's already being talked about. ## Pull Requests -Looking for an idea? Check our [issues][issues]. If it's look more open ended, +Looking for an idea? Check our [issues][issues]. If the issue looks open ended, it is probably best to post on the issue how you are thinking of resolving the issue so you can get feedback early in the process. We want you to be successful and it can be discouraging to find out a lot of re-work is needed. @@ -41,15 +41,18 @@ As a heads up, we'll be running your PR through the following gauntlet: Not everything can be checked automatically though. We request that the commit history gets cleaned up. + We ask that commits are atomic, meaning they are complete and have a single responsibility. -PRs should tell a cohesive story, with test and refactor commits that keep the +A complete commit should build, pass tests, update documentation and tests, and not have dead code. + +PRs should tell a cohesive story, with refactor and test commits that keep the fix or feature commits simple and clear. Specifically, we would encourage - File renames be isolated into their own commit -- Add tests in a commit before their feature or fix, showing the current behavior. +- Add tests in a commit before their feature or fix, showing the current behavior (i.e. they should pass). The diff for the feature/fix commit will then show how the behavior changed, - making it clearer to reviewers and the community and showing people that the + making the commit's intent clearer to reviewers and the community, and showing people that the test is verifying the expected state. - e.g. [clap#5520](https://github.com/clap-rs/clap/pull/5520) diff --git a/Cargo.toml b/Cargo.toml index 3f1bad3b..2136ceeb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,12 +14,12 @@ include = [ "Cargo.lock", "LICENSE*", "README.md", - "benches/**/*", "examples/**/*" ] [workspace.lints.rust] rust_2018_idioms = { level = "warn", priority = -1 } +unnameable_types = "warn" unreachable_pub = "warn" unsafe_op_in_unsafe_fn = "warn" unused_lifetimes = "warn" @@ -62,7 +62,7 @@ lossy_float_literal = "warn" macro_use_imports = "warn" mem_forget = "warn" mutex_integer = "warn" -needless_continue = "warn" +needless_continue = "allow" needless_for_each = "warn" negative_feature_names = "warn" path_buf_push_overwrite = "warn" @@ -86,3 +86,12 @@ uninlined_format_args = "warn" verbose_file_reads = "warn" wildcard_imports = "warn" zero_sized_map_values = "warn" + +[profile.dev] +panic = "abort" + +[profile.release] +panic = "abort" +codegen-units = 1 +lto = true +# debug = "line-tables-only" # requires Cargo 1.71 diff --git a/crates/anstream/Cargo.toml b/crates/anstream/Cargo.toml index 258f6154..579b1215 100644 --- a/crates/anstream/Cargo.toml +++ b/crates/anstream/Cargo.toml @@ -2,7 +2,6 @@ name = "anstream" version = "0.6.18" description = "A simple cross platform library for writing colored text to a terminal." -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "strip", "wincon"] repository.workspace = true diff --git a/crates/anstream/README.md b/crates/anstream/README.md index c3d92660..7e751d65 100644 --- a/crates/anstream/README.md +++ b/crates/anstream/README.md @@ -18,16 +18,16 @@ overhead stripping of ANSI escape codes. Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstream diff --git a/crates/anstream/src/lib.rs b/crates/anstream/src/lib.rs index 73ff8bf9..9233df7c 100644 --- a/crates/anstream/src/lib.rs +++ b/crates/anstream/src/lib.rs @@ -84,3 +84,7 @@ pub fn stderr() -> Stderr { /// Selection for overriding color output pub use colorchoice::ColorChoice; + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstream/src/stream.rs b/crates/anstream/src/stream.rs index b45be042..875455e2 100644 --- a/crates/anstream/src/stream.rs +++ b/crates/anstream/src/stream.rs @@ -258,6 +258,7 @@ impl AsLockedWrite for crate::Buffer { } mod private { + #[allow(unnameable_types)] pub trait Sealed {} impl Sealed for &T {} diff --git a/crates/anstyle-ansi-term/Cargo.toml b/crates/anstyle-ansi-term/Cargo.toml index 9aeea475..630e992e 100644 --- a/crates/anstyle-ansi-term/Cargo.toml +++ b/crates/anstyle-ansi-term/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-ansi-term" version = "1.0.3" description = "Adapt between ansi_term and anstyle" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "ansi_term"] repository.workspace = true diff --git a/crates/anstyle-ansi-term/LICENSE-MIT b/crates/anstyle-ansi-term/LICENSE-MIT index 9dc20e2e..a2d01088 100644 --- a/crates/anstyle-ansi-term/LICENSE-MIT +++ b/crates/anstyle-ansi-term/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-ansi-term/README.md b/crates/anstyle-ansi-term/README.md index c5a37118..1ffdf69a 100644 --- a/crates/anstyle-ansi-term/README.md +++ b/crates/anstyle-ansi-term/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-ansi-term diff --git a/crates/anstyle-ansi-term/src/lib.rs b/crates/anstyle-ansi-term/src/lib.rs index f3d0bbab..ea3cfe68 100644 --- a/crates/anstyle-ansi-term/src/lib.rs +++ b/crates/anstyle-ansi-term/src/lib.rs @@ -83,3 +83,7 @@ fn xterm_to_ansi_color(color: anstyle::Ansi256Color) -> ansi_term::Color { fn rgb_to_ansi_color(color: anstyle::RgbColor) -> ansi_term::Color { ansi_term::Color::RGB(color.0, color.1, color.2) } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-crossterm/Cargo.toml b/crates/anstyle-crossterm/Cargo.toml index fcfcc447..f4a0e259 100644 --- a/crates/anstyle-crossterm/Cargo.toml +++ b/crates/anstyle-crossterm/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-crossterm" version = "4.0.0" description = "Adapt between crossterm and anstyle" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "crossterm"] repository.workspace = true diff --git a/crates/anstyle-crossterm/LICENSE-MIT b/crates/anstyle-crossterm/LICENSE-MIT index 9dc20e2e..a2d01088 100644 --- a/crates/anstyle-crossterm/LICENSE-MIT +++ b/crates/anstyle-crossterm/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-crossterm/README.md b/crates/anstyle-crossterm/README.md index dd03ddd2..022ed788 100644 --- a/crates/anstyle-crossterm/README.md +++ b/crates/anstyle-crossterm/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-crossterm diff --git a/crates/anstyle-crossterm/src/lib.rs b/crates/anstyle-crossterm/src/lib.rs index ba844447..d1db2bca 100644 --- a/crates/anstyle-crossterm/src/lib.rs +++ b/crates/anstyle-crossterm/src/lib.rs @@ -87,3 +87,7 @@ fn rgb_to_ansi_color(color: anstyle::RgbColor) -> crossterm::style::Color { b: color.2, } } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-git/Cargo.toml b/crates/anstyle-git/Cargo.toml index 4a6efc99..f270b956 100644 --- a/crates/anstyle-git/Cargo.toml +++ b/crates/anstyle-git/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-git" version = "1.1.2" description = "Parse Git Style Descriptions" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "git", "colorparse"] repository.workspace = true diff --git a/crates/anstyle-git/LICENSE-MIT b/crates/anstyle-git/LICENSE-MIT index fe451c94..a2d01088 100644 --- a/crates/anstyle-git/LICENSE-MIT +++ b/crates/anstyle-git/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2015 Josh Triplett, 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-git/README.md b/crates/anstyle-git/README.md index d5ace6f0..6b11c19f 100644 --- a/crates/anstyle-git/README.md +++ b/crates/anstyle-git/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. ### Special Thanks diff --git a/crates/anstyle-git/src/lib.rs b/crates/anstyle-git/src/lib.rs index f8623999..e05b0027 100644 --- a/crates/anstyle-git/src/lib.rs +++ b/crates/anstyle-git/src/lib.rs @@ -294,3 +294,7 @@ mod tests { test!("blue#123456" => UnknownWord "blue#123456"); } } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-lossy/Cargo.toml b/crates/anstyle-lossy/Cargo.toml index 94cf6aff..7f837a4e 100644 --- a/crates/anstyle-lossy/Cargo.toml +++ b/crates/anstyle-lossy/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-lossy" version = "1.1.3" description = "Lossy conversion between ANSI Color Codes" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color"] repository.workspace = true diff --git a/crates/anstyle-lossy/LICENSE-MIT b/crates/anstyle-lossy/LICENSE-MIT index fe451c94..a2d01088 100644 --- a/crates/anstyle-lossy/LICENSE-MIT +++ b/crates/anstyle-lossy/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2015 Josh Triplett, 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-lossy/README.md b/crates/anstyle-lossy/README.md index c812c171..10e29cf3 100644 --- a/crates/anstyle-lossy/README.md +++ b/crates/anstyle-lossy/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-lossy diff --git a/crates/anstyle-lossy/src/lib.rs b/crates/anstyle-lossy/src/lib.rs index e0e868e1..a5b97ef4 100644 --- a/crates/anstyle-lossy/src/lib.rs +++ b/crates/anstyle-lossy/src/lib.rs @@ -422,3 +422,7 @@ const XTERM_COLORS: [anstyle::RgbColor; 256] = [ Rgb(228, 228, 228), Rgb(238, 238, 238), ]; + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-ls/Cargo.toml b/crates/anstyle-ls/Cargo.toml index b601f54c..54fc60cf 100644 --- a/crates/anstyle-ls/Cargo.toml +++ b/crates/anstyle-ls/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-ls" version = "1.0.4" description = "Parse LS_COLORS Style Descriptions" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "ls", "colorparse"] repository.workspace = true diff --git a/crates/anstyle-ls/LICENSE-MIT b/crates/anstyle-ls/LICENSE-MIT index fe451c94..a2d01088 100644 --- a/crates/anstyle-ls/LICENSE-MIT +++ b/crates/anstyle-ls/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2015 Josh Triplett, 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-ls/README.md b/crates/anstyle-ls/README.md index 6fe48386..ae0b825d 100644 --- a/crates/anstyle-ls/README.md +++ b/crates/anstyle-ls/README.md @@ -18,16 +18,16 @@ Information about the `LS_COLORS` environment variable is sparse. Here is a shor Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. ### Special Thanks diff --git a/crates/anstyle-ls/src/lib.rs b/crates/anstyle-ls/src/lib.rs index e164dfb2..59e2a784 100644 --- a/crates/anstyle-ls/src/lib.rs +++ b/crates/anstyle-ls/src/lib.rs @@ -293,3 +293,7 @@ mod tests { ); } } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-owo-colors/Cargo.toml b/crates/anstyle-owo-colors/Cargo.toml index aa874ca0..c1d25277 100644 --- a/crates/anstyle-owo-colors/Cargo.toml +++ b/crates/anstyle-owo-colors/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-owo-colors" version = "2.0.3" description = "Adapt between owo-colors and anstyle" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "owo-colors"] repository.workspace = true diff --git a/crates/anstyle-owo-colors/LICENSE-MIT b/crates/anstyle-owo-colors/LICENSE-MIT index 9dc20e2e..a2d01088 100644 --- a/crates/anstyle-owo-colors/LICENSE-MIT +++ b/crates/anstyle-owo-colors/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-owo-colors/README.md b/crates/anstyle-owo-colors/README.md index e59e6ae5..7d2e044b 100644 --- a/crates/anstyle-owo-colors/README.md +++ b/crates/anstyle-owo-colors/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-owo-colors diff --git a/crates/anstyle-owo-colors/src/lib.rs b/crates/anstyle-owo-colors/src/lib.rs index 4e9625f1..649427f5 100644 --- a/crates/anstyle-owo-colors/src/lib.rs +++ b/crates/anstyle-owo-colors/src/lib.rs @@ -87,3 +87,7 @@ fn xterm_to_owo_colors_color(color: anstyle::Ansi256Color) -> owo_colors::XtermC fn rgb_to_owo_colors_color(color: anstyle::RgbColor) -> (u8, u8, u8) { (color.0, color.1, color.2) } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-parse/Cargo.toml b/crates/anstyle-parse/Cargo.toml index 402ae85e..4933a603 100644 --- a/crates/anstyle-parse/Cargo.toml +++ b/crates/anstyle-parse/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-parse" version = "0.2.6" description = "Parse ANSI Style Escapes" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "vte"] repository.workspace = true diff --git a/crates/anstyle-parse/LICENSE-APACHE b/crates/anstyle-parse/LICENSE-APACHE index 8dada3ed..8f71f43f 100644 --- a/crates/anstyle-parse/LICENSE-APACHE +++ b/crates/anstyle-parse/LICENSE-APACHE @@ -199,3 +199,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/crates/anstyle-parse/LICENSE-MIT b/crates/anstyle-parse/LICENSE-MIT index 4c23e06d..a2d01088 100644 --- a/crates/anstyle-parse/LICENSE-MIT +++ b/crates/anstyle-parse/LICENSE-MIT @@ -1,25 +1,19 @@ -Copyright (c) 2016 Joe Wilm and individual contributors +Copyright (c) Individual contributors -Permission is hereby granted, free of charge, to any -person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without -limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software -is furnished to do so, subject to the following -conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice -shall be included in all copies or substantial portions -of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/crates/anstyle-parse/README.md b/crates/anstyle-parse/README.md index 33cf5940..705b3e0c 100644 --- a/crates/anstyle-parse/README.md +++ b/crates/anstyle-parse/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. ### Special Thanks diff --git a/crates/anstyle-parse/src/lib.rs b/crates/anstyle-parse/src/lib.rs index 21ce36a8..28f50e42 100644 --- a/crates/anstyle-parse/src/lib.rs +++ b/crates/anstyle-parse/src/lib.rs @@ -436,3 +436,7 @@ pub trait Perform { /// subsequent characters were ignored. fn esc_dispatch(&mut self, _intermediates: &[u8], _ignore: bool, _byte: u8) {} } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-query/README.md b/crates/anstyle-query/README.md index 75d5accd..cff93acb 100644 --- a/crates/anstyle-query/README.md +++ b/crates/anstyle-query/README.md @@ -6,10 +6,20 @@ ![License](https://img.shields.io/crates/l/anstyle-query.svg) [![Crates Status](https://img.shields.io/crates/v/anstyle-query.svg)](https://crates.io/crates/anstyle-query) -## [Contribute](../../CONTRIBUTING.md) - ## License -Dual-licensed under [MIT](../../LICENSE-MIT) or [Apache 2.0](../../LICENSE-APACHE) +Licensed under either of + +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) + +at your option. + +## [Contribute](../../CONTRIBUTING.md) + +Unless you explicitly state otherwise, any contribution intentionally +submitted for inclusion in the work by you, as defined in the Apache-2.0 +license, shall be dual-licensed as above, without any additional terms or +conditions. [Documentation]: https://docs.rs/anstyle-query diff --git a/crates/anstyle-query/src/lib.rs b/crates/anstyle-query/src/lib.rs index 64ae7942..c6676fd4 100644 --- a/crates/anstyle-query/src/lib.rs +++ b/crates/anstyle-query/src/lib.rs @@ -157,3 +157,7 @@ mod test { assert!(non_empty(Some(std::ffi::OsStr::new("hello")))); } } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-roff/Cargo.toml b/crates/anstyle-roff/Cargo.toml index 8835575d..cc710fc2 100644 --- a/crates/anstyle-roff/Cargo.toml +++ b/crates/anstyle-roff/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-roff" version = "0.3.5" description = "Adapt between anstyle and roff" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "roff"] repository.workspace = true diff --git a/crates/anstyle-roff/LICENSE-MIT b/crates/anstyle-roff/LICENSE-MIT index 9dc20e2e..a2d01088 100644 --- a/crates/anstyle-roff/LICENSE-MIT +++ b/crates/anstyle-roff/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-roff/README.md b/crates/anstyle-roff/README.md index bc6ef9bc..a3e5e1b2 100644 --- a/crates/anstyle-roff/README.md +++ b/crates/anstyle-roff/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-roff diff --git a/crates/anstyle-roff/src/lib.rs b/crates/anstyle-roff/src/lib.rs index a111b308..ea88cdf8 100644 --- a/crates/anstyle-roff/src/lib.rs +++ b/crates/anstyle-roff/src/lib.rs @@ -174,3 +174,7 @@ mod tests { assert_eq!(to_hex(&RgbColor(0, 0, 255)).as_str(), "#0000ff"); } } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-svg/Cargo.toml b/crates/anstyle-svg/Cargo.toml index 2f377092..0a206317 100644 --- a/crates/anstyle-svg/Cargo.toml +++ b/crates/anstyle-svg/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-svg" version = "0.1.7" description = "Convert ANSI escape codes to SVG" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "svg"] repository.workspace = true diff --git a/crates/anstyle-svg/README.md b/crates/anstyle-svg/README.md index 917ef697..6fe91406 100644 --- a/crates/anstyle-svg/README.md +++ b/crates/anstyle-svg/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-svg diff --git a/crates/anstyle-svg/src/lib.rs b/crates/anstyle-svg/src/lib.rs index dc93635a..43dc9563 100644 --- a/crates/anstyle-svg/src/lib.rs +++ b/crates/anstyle-svg/src/lib.rs @@ -453,3 +453,7 @@ fn split_lines(styled: &[(anstyle::Style, String)]) -> Vec) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-syntect diff --git a/crates/anstyle-syntect/src/lib.rs b/crates/anstyle-syntect/src/lib.rs index 083209a8..1d9def64 100644 --- a/crates/anstyle-syntect/src/lib.rs +++ b/crates/anstyle-syntect/src/lib.rs @@ -35,3 +35,7 @@ pub fn to_anstyle_effects(style: syntect::highlighting::FontStyle) -> anstyle::E effects } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-termcolor/Cargo.toml b/crates/anstyle-termcolor/Cargo.toml index 492e3f83..edeb4aef 100644 --- a/crates/anstyle-termcolor/Cargo.toml +++ b/crates/anstyle-termcolor/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-termcolor" version = "1.1.3" description = "Adapt between termcolor and anstyle" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "termcolor"] repository.workspace = true diff --git a/crates/anstyle-termcolor/LICENSE-MIT b/crates/anstyle-termcolor/LICENSE-MIT index 9dc20e2e..a2d01088 100644 --- a/crates/anstyle-termcolor/LICENSE-MIT +++ b/crates/anstyle-termcolor/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-termcolor/README.md b/crates/anstyle-termcolor/README.md index 682b7ae9..27a0902c 100644 --- a/crates/anstyle-termcolor/README.md +++ b/crates/anstyle-termcolor/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-termcolor diff --git a/crates/anstyle-termcolor/src/lib.rs b/crates/anstyle-termcolor/src/lib.rs index e6b8c4b9..04247e58 100644 --- a/crates/anstyle-termcolor/src/lib.rs +++ b/crates/anstyle-termcolor/src/lib.rs @@ -58,3 +58,7 @@ fn xterm_to_termcolor_color(color: anstyle::Ansi256Color) -> termcolor::Color { fn rgb_to_termcolor_color(color: anstyle::RgbColor) -> termcolor::Color { termcolor::Color::Rgb(color.0, color.1, color.2) } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-wincon/Cargo.toml b/crates/anstyle-wincon/Cargo.toml index c1013f93..47e7f877 100644 --- a/crates/anstyle-wincon/Cargo.toml +++ b/crates/anstyle-wincon/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-wincon" version = "3.0.8" description = "Styling legacy Windows terminals" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "windows"] repository.workspace = true diff --git a/crates/anstyle-wincon/LICENSE-MIT b/crates/anstyle-wincon/LICENSE-MIT index fe451c94..a2d01088 100644 --- a/crates/anstyle-wincon/LICENSE-MIT +++ b/crates/anstyle-wincon/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2015 Josh Triplett, 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-wincon/README.md b/crates/anstyle-wincon/README.md index 7df0db54..1d1e4731 100644 --- a/crates/anstyle-wincon/README.md +++ b/crates/anstyle-wincon/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. ### Special Thanks diff --git a/crates/anstyle-wincon/src/lib.rs b/crates/anstyle-wincon/src/lib.rs index 52327b14..833a9947 100644 --- a/crates/anstyle-wincon/src/lib.rs +++ b/crates/anstyle-wincon/src/lib.rs @@ -19,3 +19,7 @@ mod stream; pub mod windows; pub use stream::WinconStream; + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle-yansi/Cargo.toml b/crates/anstyle-yansi/Cargo.toml index 769d0cca..fe67058e 100644 --- a/crates/anstyle-yansi/Cargo.toml +++ b/crates/anstyle-yansi/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle-yansi" version = "2.0.2" description = "Adapt between yansi and anstyle" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "yansi"] repository.workspace = true diff --git a/crates/anstyle-yansi/LICENSE-MIT b/crates/anstyle-yansi/LICENSE-MIT index 9dc20e2e..a2d01088 100644 --- a/crates/anstyle-yansi/LICENSE-MIT +++ b/crates/anstyle-yansi/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle-yansi/README.md b/crates/anstyle-yansi/README.md index b5cebea7..f507fc77 100644 --- a/crates/anstyle-yansi/README.md +++ b/crates/anstyle-yansi/README.md @@ -10,16 +10,16 @@ Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle-yansi diff --git a/crates/anstyle-yansi/src/lib.rs b/crates/anstyle-yansi/src/lib.rs index 31142e79..86aa70fb 100644 --- a/crates/anstyle-yansi/src/lib.rs +++ b/crates/anstyle-yansi/src/lib.rs @@ -82,3 +82,7 @@ fn xterm_to_yansi_color(color: anstyle::Ansi256Color) -> yansi::Color { fn rgb_to_yansi_color(color: anstyle::RgbColor) -> yansi::Color { yansi::Color::Rgb(color.0, color.1, color.2) } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/anstyle/Cargo.toml b/crates/anstyle/Cargo.toml index cc2c1227..38a875b7 100644 --- a/crates/anstyle/Cargo.toml +++ b/crates/anstyle/Cargo.toml @@ -2,7 +2,6 @@ name = "anstyle" version = "1.0.10" description = "ANSI text styling" -homepage = "https://github.com/rust-cli/anstyle" categories = ["command-line-interface"] keywords = ["ansi", "terminal", "color", "no_std"] repository.workspace = true diff --git a/crates/anstyle/LICENSE-MIT b/crates/anstyle/LICENSE-MIT index 9dc20e2e..a2d01088 100644 --- a/crates/anstyle/LICENSE-MIT +++ b/crates/anstyle/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2022 The rust-cli Developers +Copyright (c) Individual contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/crates/anstyle/README.md b/crates/anstyle/README.md index 706e8a18..3025c188 100644 --- a/crates/anstyle/README.md +++ b/crates/anstyle/README.md @@ -26,16 +26,16 @@ General utilities: Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. -### Contribution +## [Contribute](../../CONTRIBUTING.md) Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 -license, shall be dual licensed as above, without any additional terms or +license, shall be dual-licensed as above, without any additional terms or conditions. [Crates.io]: https://crates.io/crates/anstyle diff --git a/crates/anstyle/src/lib.rs b/crates/anstyle/src/lib.rs index 2b12072d..a8802224 100644 --- a/crates/anstyle/src/lib.rs +++ b/crates/anstyle/src/lib.rs @@ -64,3 +64,7 @@ pub use color::*; pub use effect::*; pub use reset::*; pub use style::*; + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/crates/colorchoice-clap/README.md b/crates/colorchoice-clap/README.md index f46f3dad..158193ff 100644 --- a/crates/colorchoice-clap/README.md +++ b/crates/colorchoice-clap/README.md @@ -6,10 +6,20 @@ ![License](https://img.shields.io/crates/l/colorchoice-clap.svg) [![Crates Status](https://img.shields.io/crates/v/colorchoice-clap.svg)](https://crates.io/crates/colorchoice-clap) -## [Contribute](../../CONTRIBUTING.md) - ## License -Dual-licensed under [MIT](../../LICENSE-MIT) or [Apache 2.0](../../LICENSE-APACHE) +Licensed under either of + +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) + +at your option. + +## [Contribute](../../CONTRIBUTING.md) + +Unless you explicitly state otherwise, any contribution intentionally +submitted for inclusion in the work by you, as defined in the Apache-2.0 +license, shall be dual-licensed as above, without any additional terms or +conditions. [Documentation]: https://docs.rs/colorchoice-clap diff --git a/crates/colorchoice/README.md b/crates/colorchoice/README.md index cc5e13f1..15300f1d 100644 --- a/crates/colorchoice/README.md +++ b/crates/colorchoice/README.md @@ -6,6 +6,15 @@ ![License](https://img.shields.io/crates/l/colorchoice.svg) [![Crates Status](https://img.shields.io/crates/v/colorchoice.svg)](https://crates.io/crates/colorchoice) +## License + +Licensed under either of + +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) + +at your option. + ## [Contribute](../../CONTRIBUTING.md) Special note: to be successful, this crate **cannot** break compatibility or @@ -17,8 +26,9 @@ Similarly, we should strive to reduce **risk** of breaking compatibility by exposing as little as possible. Anything more should be broken out into a separate crate that this crate can call into. -## License - -Dual-licensed under [MIT](../../LICENSE-MIT) or [Apache 2.0](../../LICENSE-APACHE) +Unless you explicitly state otherwise, any contribution intentionally +submitted for inclusion in the work by you, as defined in the Apache-2.0 +license, shall be dual-licensed as above, without any additional terms or +conditions. [Documentation]: https://docs.rs/colorchoice diff --git a/crates/colorchoice/src/lib.rs b/crates/colorchoice/src/lib.rs index 78b9ef47..bfe56728 100644 --- a/crates/colorchoice/src/lib.rs +++ b/crates/colorchoice/src/lib.rs @@ -114,3 +114,7 @@ mod test { assert_eq!(expected, actual); } } + +#[doc = include_str!("../README.md")] +#[cfg(doctest)] +pub struct ReadmeDoctests; diff --git a/deny.toml b/deny.toml index b6ecbe9c..ee5ae89b 100644 --- a/deny.toml +++ b/deny.toml @@ -87,6 +87,7 @@ allow = [ "MIT", "MIT-0", "Apache-2.0", + "BSD-2-Clause", "BSD-3-Clause", "MPL-2.0", "Unicode-DFS-2016",