Skip to content

Commit

Permalink
Raise required compiler to Rust 1.70
Browse files Browse the repository at this point in the history
  • Loading branch information
dtolnay committed Oct 26, 2024
1 parent b3f2077 commit c8df6d4
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [nightly, beta, stable, 1.67.0, 1.70.0, 1.74.0]
rust: [nightly, beta, stable, 1.70.0, 1.74.0]
os: [ubuntu]
include:
- name: Cargo on macOS
Expand Down Expand Up @@ -60,7 +60,6 @@ jobs:
shell: bash
- run: cargo run --manifest-path demo/Cargo.toml
- run: cargo test --workspace ${{steps.testsuite.outputs.exclude}}
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.67"
rust-version = "1.70"

[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.67+ and c++11 or newer*<br>
*Compiler support: requires rustc 1.70+ 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 @@ -36,8 +36,8 @@ fn main() {
println!("cargo:rustc-check-cfg=cfg(skip_ui_tests)");
}

if rustc.minor < 67 {
println!("cargo:warning=The cxx crate requires a rustc version 1.67.0 or newer.");
if rustc.minor < 70 {
println!("cargo:warning=The cxx crate requires a rustc version 1.70.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.67"
rust-version = "1.70"

[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.67"
rust-version = "1.70"

[features]
parallel = ["cc/parallel"]
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.67"
rust-version = "1.70"

[dependencies]
codespan-reporting = "0.11.1"
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.67"
rust-version = "1.70"

[lib]
proc-macro = true
Expand Down
2 changes: 1 addition & 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.67+ and c++11 or newer*<br>
//! *Compiler support: requires rustc 1.70+ and c++11 or newer*<br>
//! *[Release notes](https://github.com/dtolnay/cxx/releases)*
//!
//! <br>
Expand Down

0 comments on commit c8df6d4

Please sign in to comment.