mirror of
https://gitee.com/openharmony/third_party_rust_clap
synced 2024-11-27 01:00:45 +00:00
chore: Bump MSRV to 1.64.0
This commit is contained in:
parent
fda2a961cb
commit
f25fe5b3e0
@ -1 +1 @@
|
||||
msrv = "1.60.0" # MSRV
|
||||
msrv = "1.64.0" # MSRV
|
||||
|
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
@ -78,7 +78,7 @@ jobs:
|
||||
build: [msrv, wasm, wasm-wasi, debug, release]
|
||||
include:
|
||||
- build: msrv
|
||||
rust: 1.60.0 # MSRV
|
||||
rust: 1.64.0 # MSRV
|
||||
target: x86_64-unknown-linux-gnu
|
||||
features: full
|
||||
- build: wasm
|
||||
@ -124,7 +124,7 @@ jobs:
|
||||
- name: Install Rust
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: 1.60.0 # MSRV
|
||||
toolchain: 1.64.0 # MSRV
|
||||
profile: minimal
|
||||
override: true
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
@ -139,7 +139,7 @@ jobs:
|
||||
- name: Install Rust
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: 1.60.0 # MSRV
|
||||
toolchain: 1.64.0 # MSRV
|
||||
profile: minimal
|
||||
override: true
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
@ -174,7 +174,7 @@ jobs:
|
||||
- name: Install Rust
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
toolchain: 1.60.0 # MSRV
|
||||
toolchain: 1.64.0 # MSRV
|
||||
profile: minimal
|
||||
override: true
|
||||
components: clippy
|
||||
|
4
.github/workflows/rust-next.yml
vendored
4
.github/workflows/rust-next.yml
vendored
@ -92,9 +92,9 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
rust:
|
||||
- 1.60.0 # MSRV
|
||||
- 1.64.0 # MSRV
|
||||
- stable
|
||||
continue-on-error: ${{ matrix.rust != '1.60.0' }} # MSRV
|
||||
continue-on-error: ${{ matrix.rust != '1.64.0' }} # MSRV
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
|
@ -23,7 +23,7 @@ keywords = [
|
||||
]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.60.0" # MSRV
|
||||
rust-version = "1.64.0" # MSRV
|
||||
include = [
|
||||
"build.rs",
|
||||
"src/**/*",
|
||||
|
2
Makefile
2
Makefile
@ -10,7 +10,7 @@ ifneq (${TOOLCHAIN_TARGET},)
|
||||
ARGS+=--target ${TOOLCHAIN_TARGET}
|
||||
endif
|
||||
|
||||
MSRV?=1.60.0
|
||||
MSRV?=1.64.0
|
||||
|
||||
_FEATURES = minimal default wasm full debug release
|
||||
_FEATURES_minimal = --no-default-features --features "std"
|
||||
|
@ -4,7 +4,7 @@ version = "0.0.0"
|
||||
description = "Benchmarks for clap"
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.60.0" # MSRV
|
||||
rust-version = "1.64.0" # MSRV
|
||||
publish = false
|
||||
|
||||
[package.metadata.release]
|
||||
|
@ -12,7 +12,7 @@ keywords = [
|
||||
]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.60.0" # MSRV
|
||||
rust-version = "1.64.0" # MSRV
|
||||
include = [
|
||||
"build.rs",
|
||||
"src/**/*",
|
||||
|
@ -12,7 +12,7 @@ keywords = [
|
||||
]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.60.0" # MSRV
|
||||
rust-version = "1.64.0" # MSRV
|
||||
include = [
|
||||
"build.rs",
|
||||
"src/**/*",
|
||||
|
@ -13,7 +13,7 @@ keywords = [
|
||||
]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.60.0" # MSRV
|
||||
rust-version = "1.64.0" # MSRV
|
||||
include = [
|
||||
"build.rs",
|
||||
"src/**/*",
|
||||
|
@ -13,7 +13,7 @@ keywords = [
|
||||
]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.60.0" # MSRV
|
||||
rust-version = "1.64.0" # MSRV
|
||||
include = [
|
||||
"build.rs",
|
||||
"src/**/*",
|
||||
|
@ -12,7 +12,7 @@ keywords = [
|
||||
]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.60.0" # MSRV
|
||||
rust-version = "1.64.0" # MSRV
|
||||
include = [
|
||||
"build.rs",
|
||||
"src/**/*",
|
||||
|
@ -24,7 +24,7 @@
|
||||
//! - Leverage feature flags to keep to one active branch
|
||||
//! - Being under [WG-CLI](https://github.com/rust-cli/team/) to increase the bus factor
|
||||
//! - We follow semver and will wait about 6-9 months between major breaking changes
|
||||
//! - We will support the last two minor Rust releases (MSRV, currently 1.60.0)
|
||||
//! - We will support the last two minor Rust releases (MSRV, currently 1.64.0)
|
||||
//!
|
||||
//! While these aspirations can be at odds with fast build times and low binary
|
||||
//! size, we will still strive to keep these reasonable for the flexibility you
|
||||
|
@ -6,7 +6,7 @@
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
|
||||
#[cfg(feature = "derive")]
|
||||
#[rustversion::attr(any(not(stable), before(1.60), since(1.61)), ignore)] // MSRV
|
||||
#[rustversion::attr(any(not(stable), before(1.64), since(1.65)), ignore)] // MSRV
|
||||
#[test]
|
||||
fn ui() {
|
||||
let t = trybuild::TestCases::new();
|
||||
|
@ -3,3 +3,5 @@ error[E0277]: the trait bound `bool: ValueEnum` is not satisfied
|
||||
|
|
||||
6 | #[arg(short, value_enum, default_value_t)]
|
||||
| ^^^^^^^^^^^^^^^ the trait `ValueEnum` is not implemented for `bool`
|
||||
|
|
||||
= help: the trait `ValueEnum` is implemented for `ColorChoice`
|
||||
|
@ -3,3 +3,5 @@ error[E0277]: the trait bound `SubCmd: clap::Args` is not satisfied
|
||||
|
|
||||
3 | Sub(SubCmd),
|
||||
| ^^^^^^ the trait `clap::Args` is not implemented for `SubCmd`
|
||||
|
|
||||
= help: the trait `clap::Args` is implemented for `Box<T>`
|
||||
|
@ -3,3 +3,7 @@ error[E0277]: the trait bound `SubCmd: clap::Args` is not satisfied
|
||||
|
|
||||
3 | #[command(flatten)]
|
||||
| ^^^^^^^ the trait `clap::Args` is not implemented for `SubCmd`
|
||||
|
|
||||
= help: the following other types implement trait `clap::Args`:
|
||||
Box<T>
|
||||
Opt
|
||||
|
@ -4,4 +4,7 @@ error[E0277]: the trait bound `SubCmd: Subcommand` is not satisfied
|
||||
1 | #[derive(clap::Parser)]
|
||||
| ^^^^^^^^^^^^ the trait `Subcommand` is not implemented for `SubCmd`
|
||||
|
|
||||
= help: the following other types implement trait `Subcommand`:
|
||||
Box<T>
|
||||
Opt
|
||||
= note: this error originates in the derive macro `clap::Parser` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
@ -10,7 +10,7 @@ error[E0599]: no function or associated item named `parse` found for struct `Opt
|
||||
--> tests/derive_ui/tuple_struct.rs:16:20
|
||||
|
|
||||
13 | struct Opt(u32);
|
||||
| ---------------- function or associated item `parse` not found for this
|
||||
| ---------- function or associated item `parse` not found for this struct
|
||||
...
|
||||
16 | let opt = Opt::parse();
|
||||
| ^^^^^ function or associated item not found in `Opt`
|
||||
|
Loading…
Reference in New Issue
Block a user