Raise minimum rustc to 1.60

dtolnay · Jan 7, 2023 · fe16a5d · fe16a5d
1 parent 1f36272
commit fe16a5d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ keywords = ["ffi", "c++"]
 license = "MIT OR Apache-2.0"
 links = "cxxbridge1"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.48"
+rust-version = "1.60"
 
 [features]
 default = ["std", "cxxbridge-flags/default"] # c++11

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ cxx = "1.0"
 cxx-build = "1.0"
 ```
 
-*Compiler support: requires rustc 1.48+ and c++11 or newer*<br>
+*Compiler support: requires rustc 1.60+ and c++11 or newer*<br>
 *[Release notes](https://github.com/dtolnay/cxx/releases)*
 
 <br>

diff --git a/build.rs b/build.rs
@@ -21,19 +21,13 @@ fn main() {
     }
 
     if let Some(rustc) = rustc_version() {
-        if rustc.minor < 48 {
-            println!("cargo:warning=The cxx crate requires a rustc version 1.48.0 or newer.");
+        if rustc.minor < 60 {
+            println!("cargo:warning=The cxx crate requires a rustc version 1.60.0 or newer.");
             println!(
                 "cargo:warning=You appear to be building with: {}",
                 rustc.version,
             );
         }
-
-        if rustc.minor < 52 {
-            // #![deny(unsafe_op_in_unsafe_fn)].
-            // https://github.com/rust-lang/rust/issues/71668
-            println!("cargo:rustc-cfg=no_unsafe_op_in_unsafe_fn_lint");
-        }
     }
 }
 

diff --git a/flags/Cargo.toml b/flags/Cargo.toml
@@ -7,7 +7,7 @@ description = "Compiler configuration of the `cxx` crate (implementation detail)
 edition = "2018"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.48"
+rust-version = "1.60"
 
 [features]
 default = [] # c++11

diff --git a/gen/build/Cargo.toml b/gen/build/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://cxx.rs"
 keywords = ["ffi", "build-dependencies"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.48"
+rust-version = "1.60"
 
 [features]
 parallel = ["cc/parallel"]

diff --git a/gen/lib/Cargo.toml b/gen/lib/Cargo.toml
@@ -9,7 +9,7 @@ exclude = ["build.rs"]
 keywords = ["ffi"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.48"
+rust-version = "1.60"
 
 [dependencies]
 codespan-reporting = "0.11"

diff --git a/macro/Cargo.toml b/macro/Cargo.toml
@@ -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.48"
+rust-version = "1.60"
 
 [lib]
 proc-macro = true

diff --git a/src/lib.rs b/src/lib.rs
@@ -18,7 +18,7 @@
 //!
 //! <br>
 //!
-//! *Compiler support: requires rustc 1.48+ and c++11 or newer*<br>
+//! *Compiler support: requires rustc 1.60+ and c++11 or newer*<br>
 //! *[Release notes](https://github.com/dtolnay/cxx/releases)*
 //!
 //! <br>
@@ -365,9 +365,12 @@
 
 #![no_std]
 #![doc(html_root_url = "https://docs.rs/cxx/1.0.86")]
-#![deny(improper_ctypes, improper_ctypes_definitions, missing_docs)]
-#![cfg_attr(not(no_unsafe_op_in_unsafe_fn_lint), deny(unsafe_op_in_unsafe_fn))]
-#![cfg_attr(no_unsafe_op_in_unsafe_fn_lint, allow(unused_unsafe))]
+#![deny(
+    improper_ctypes,
+    improper_ctypes_definitions,
+    missing_docs,
+    unsafe_op_in_unsafe_fn
+)]
 #![cfg_attr(doc_cfg, feature(doc_cfg))]
 #![allow(non_camel_case_types)]
 #![allow(