Skip to content

Commit

Permalink
Raise required compiler to rust 1.67
Browse files Browse the repository at this point in the history
Required by recent versions of the cc crate.

    error: package `cc v1.0.106` cannot be built because it requires rustc 1.67 or newer, while the currently active rustc version is 1.63.0
  • Loading branch information
dtolnay committed Jul 9, 2024
1 parent afd4aa3 commit 3ea1e9f
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 13 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ jobs:
- rust: nightly
- rust: beta
- rust: stable
- rust: 1.63.0
- rust: 1.64.0
- rust: 1.67.0
- rust: 1.70.0
- rust: 1.74.0
- name: Cargo on macOS
Expand Down Expand Up @@ -65,7 +64,7 @@ jobs:
shell: bash
- run: cargo run --manifest-path demo/Cargo.toml
- run: cargo test --workspace ${{steps.testsuite.outputs.exclude}}
if: matrix.rust != '1.63.0' && matrix.rust != '1.64.0'
if: matrix.rust != '1.67.0'
- run: cargo check --no-default-features --features alloc
env:
RUSTFLAGS: --cfg compile_error_if_std ${{env.RUSTFLAGS}}
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ keywords = ["ffi", "c++"]
license = "MIT OR Apache-2.0"
links = "cxxbridge1"
repository = "https://github.com/dtolnay/cxx"
rust-version = "1.63"
rust-version = "1.67"

[features]
default = ["std", "cxxbridge-flags/default"] # c++11
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cxx = "1.0"
cxx-build = "1.0"
```

*Compiler support: requires rustc 1.63+ and c++11 or newer*<br>
*Compiler support: requires rustc 1.67+ and c++11 or newer*<br>
*[Release notes](https://github.com/dtolnay/cxx/releases)*

<br>
Expand Down
4 changes: 2 additions & 2 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ fn main() {
println!("cargo:rustc-check-cfg=cfg(skip_ui_tests)");
}

if rustc.minor < 63 {
println!("cargo:warning=The cxx crate requires a rustc version 1.63.0 or newer.");
if rustc.minor < 67 {
println!("cargo:warning=The cxx crate requires a rustc version 1.67.0 or newer.");
println!(
"cargo:warning=You appear to be building with: {}",
rustc.version,
Expand Down
2 changes: 1 addition & 1 deletion flags/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "Compiler configuration of the `cxx` crate (implementation detail)
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/cxx"
rust-version = "1.63"
rust-version = "1.67"

[features]
default = [] # c++11
Expand Down
2 changes: 1 addition & 1 deletion gen/build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ homepage = "https://cxx.rs"
keywords = ["ffi", "build-dependencies"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/cxx"
rust-version = "1.63"
rust-version = "1.67"

[features]
parallel = ["cc/parallel"]
Expand Down
1 change: 1 addition & 0 deletions gen/build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
clippy::inherent_to_string,
clippy::into_iter_without_iter,
clippy::items_after_statements,
clippy::manual_let_else,
clippy::match_bool,
clippy::match_on_vec_items,
clippy::match_same_arms,
Expand Down
2 changes: 1 addition & 1 deletion gen/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exclude = ["build.rs"]
keywords = ["ffi"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/cxx"
rust-version = "1.63"
rust-version = "1.67"

[dependencies]
codespan-reporting = "0.11.1"
Expand Down
1 change: 1 addition & 0 deletions gen/lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
clippy::inherent_to_string,
clippy::into_iter_without_iter,
clippy::items_after_statements,
clippy::manual_let_else,
clippy::match_bool,
clippy::match_on_vec_items,
clippy::match_same_arms,
Expand Down
2 changes: 1 addition & 1 deletion macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage = "https://cxx.rs"
keywords = ["ffi"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/cxx"
rust-version = "1.63"
rust-version = "1.67"

[lib]
proc-macro = true
Expand Down
1 change: 1 addition & 0 deletions macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
clippy::into_iter_without_iter,
clippy::items_after_statements,
clippy::large_enum_variant,
clippy::manual_let_else,
clippy::match_bool,
clippy::match_same_arms,
clippy::module_name_repetitions,
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
//!
//! <br>
//!
//! *Compiler support: requires rustc 1.63+ and c++11 or newer*<br>
//! *Compiler support: requires rustc 1.67+ and c++11 or newer*<br>
//! *[Release notes](https://github.com/dtolnay/cxx/releases)*
//!
//! <br>
Expand Down Expand Up @@ -400,6 +400,7 @@
clippy::or_fun_call,
clippy::ptr_arg,
clippy::ptr_as_ptr,
clippy::ptr_cast_constness,
clippy::toplevel_ref_arg,
clippy::transmute_undefined_repr, // clippy bug: https://github.com/rust-lang/rust-clippy/issues/8417
clippy::uninlined_format_args,
Expand Down
3 changes: 2 additions & 1 deletion tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
clippy::cast_possible_truncation,
clippy::cast_possible_wrap,
clippy::float_cmp,
clippy::needless_pass_by_value,
clippy::needless_pass_by_ref_mut,
clippy::needless_pass_by_value,
clippy::ptr_cast_constness,
clippy::unit_cmp,
clippy::unseparated_literal_suffix
)]
Expand Down

0 comments on commit 3ea1e9f

Please sign in to comment.