Remove dependency on rustc_version.

engine/Cargo.toml

@@ -50,9 +50,7 @@ thiserror = "1"
 regex = "1.5"
 indexmap = "1.8"
 prettyplease = { version = "0.1.15", features = ["verbatim"] }
-
-[build-dependencies]
-rustc_version = "0.4"
+rustversion = "1.0"
 
 [dependencies.syn]
 version = "1.0.39"

engine/src/lib.rs

@@ -10,9 +10,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// This feature=nightly could be set by build.rs, but since we only care
-// about it for docs, we ask docs.rs to set it in the Cargo.toml.
-#![cfg_attr(feature = "nightly", feature(doc_cfg))]
 #![forbid(unsafe_code)]
 
 mod ast_discoverer;

integration-tests/Cargo.toml

@@ -39,7 +39,7 @@ indoc = "1.0"
 log = "0.4"
 cxx = "1.0.78"
 itertools = "0.10"
-rustc_version = "0.4.0"
+rustversion = "1.0"
 
 [dependencies.syn]
 version = "1.0.39"

integration-tests/tests/cpprefs_test.rs

@@ -13,6 +13,16 @@ use indoc::indoc;
 use proc_macro2::TokenStream;
 use quote::quote;
 
+#[rustversion::nightly]
+const fn arbitrary_self_types_supported() -> bool {
+    true
+}
+
+#[rustversion::not(nightly)]
+const fn arbitrary_self_types_supported() -> bool {
+    false
+}
+
 /// A positive test, we expect to pass.
 fn run_cpprefs_test(
     cxx_code: &str,
@@ -21,7 +31,7 @@ fn run_cpprefs_test(
     generate: &[&str],
     generate_pods: &[&str],
 ) {
-    if rustc_version::version_meta().unwrap().channel != rustc_version::Channel::Nightly {
+    if !arbitrary_self_types_supported() {
         // "unsafe_references_wrapped" requires arbitrary_self_types, which requires nightly.
         return;
     }
@@ -62,10 +72,7 @@ fn test_method_call_mut() {
         quote! {
             let goat = ffi::Goat::new().within_unique_ptr();
             let mut goat = autocxx::CppUniquePtrPin::new(goat);
-            // Only nightly supports calling methods on cpp refs
-            if rustc_version::version_meta().unwrap().channel == rustc_version::Channel::Nightly {
-                goat.as_cpp_mut_ref().add_a_horn();
-            }
+            goat.as_cpp_mut_ref().add_a_horn();
         },
         &["Goat"],
         &[],
@@ -98,10 +105,7 @@ fn test_method_call_const() {
         quote! {
             let goat = ffi::Goat::new().within_unique_ptr();
             let goat = autocxx::CppUniquePtrPin::new(goat);
-            // Only nightly supports calling methods on cpp refs
-            if rustc_version::version_meta().unwrap().channel == rustc_version::Channel::Nightly {
-                goat.as_cpp_ref().describe();
-            }
+            goat.as_cpp_ref().describe();
         },
         &["Goat"],
         &[],

src/lib.rs

@@ -1,5 +1,4 @@
 #![doc = include_str!("../README.md")]
-#![cfg_attr(nightly, feature(receiver_trait))]
 
 // Copyright 2020 Google LLC
 //