Add support for edition 2024

Co-authored-by: Yuri Astrakhan <[email protected]>

Author: pvdrz

bindgen/features.rs

@@ -79,12 +79,93 @@ impl fmt::Display for InvalidRustTarget {
     }
 }
 
+ /// This macro defines the Rust editions supported by bindgen.
+ macro_rules! define_rust_editions {
+     ($($variant:ident($value:literal) => $minor:literal,)*) => {
+         #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
+         pub enum RustEdition {
+             $(
+                 #[doc = concat!("The ", stringify!($value), " edition of Rust.")]
+                 $variant,
+             )*
+         }
+ 
+         impl FromStr for RustEdition {
+             type Err = InvalidRustEdition;
+ 
+             fn from_str(s: &str) -> Result<Self, Self::Err> {
+                 match s {
+                     $(stringify!($value) => Ok(Self::$variant),)*
+                     _ => Err(InvalidRustEdition(s.to_owned())),
+                 }
+             }
+         }
+ 
+         impl fmt::Display for RustEdition {
+             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                 match self {
+                     $(Self::$variant => stringify!($value).fmt(f),)*
+                 }
+             }
+         }
+ 
+         impl RustEdition {
+             pub(crate) const ALL: [Self; [$($value,)*].len()] = [$(Self::$variant,)*];
+ 
+             pub(crate) fn is_available(self, target: RustTarget) -> bool {
+                 let Some(minor) = target.minor() else {
+                     return true;
+                 };
+ 
+                 match self {
+                     $(Self::$variant => $minor <= minor,)*
+                 }
+             }
+         }
+     }
+ }
+ 
+ #[derive(Debug)]
+ pub struct InvalidRustEdition(String);
+ 
+ impl fmt::Display for InvalidRustEdition {
+     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+         write!(f, "\"{}\" is not a valid Rust edition", self.0)
+     }
+ }
+ 
+ impl std::error::Error for InvalidRustEdition {}
+ 
+ define_rust_editions! {
+     Edition2018(2018) => 31,
+     Edition2021(2021) => 56,
++    Edition2024(2024) => 85,
+ }
+ 
+ impl RustTarget {
+     /// Returns the latest edition supported by this target.
+     pub(crate) fn latest_edition(self) -> RustEdition {
+         RustEdition::ALL
+             .iter()
+             .rev()
+             .find(|edition| edition.is_available(self))
+             .copied()
+             .expect("bindgen should always support at least one edition")
+     }
+ }
+ 
+ impl Default for RustEdition {
+     fn default() -> Self {
+         RustTarget::default().latest_edition()
+     }
+ }
+ 
 /// This macro defines the [`RustTarget`] and [`RustFeatures`] types.
 macro_rules! define_rust_targets {
     (
-        Nightly => {$($nightly_feature:ident $(: #$issue:literal)?),* $(,)?} $(,)?
+        Nightly => {$($nightly_feature:ident $(($nightly_edition:literal))|* $(: #$issue:literal)?),* $(,)?} $(,)?
         $(
-            $variant:ident($minor:literal) => {$($feature:ident $(: #$pull:literal)?),* $(,)?},
+            $variant:ident($minor:literal) => {$($feature:ident $(($edition:literal))|* $(: #$pull:literal)?),* $(,)?},
         )*
         $(,)?
     ) => {
@@ -163,7 +244,7 @@ define_rust_targets! {
     },
     Stable_1_77(77) => {
         offset_of: #106655,
-        literal_cstr: #117472,
+        literal_cstr(2021)|(2024): #117472,
     },
     Stable_1_73(73) => { thiscall_abi: #42202 },
     Stable_1_71(71) => { c_unwind_abi: #106075 },
@@ -306,6 +387,26 @@ impl Default for RustFeatures {
 mod test {
     use super::*;
 
+    #[test]
+    fn release_versions_for_editions() {
+        assert_eq!(
+            "1.33".parse::<RustTarget>().unwrap().latest_edition(),
+            RustEdition::Edition2018
+        );
+        assert_eq!(
+            "1.56".parse::<RustTarget>().unwrap().latest_edition(),
+            RustEdition::Edition2021
+        );
+        assert_eq!(
+            "1.85".parse::<RustTarget>().unwrap().latest_edition(),
+            RustEdition::Edition2024
+        );
+        assert_eq!(
+            "nightly".parse::<RustTarget>().unwrap().latest_edition(),
+            RustEdition::Edition2024
+        );
+    }
+
     #[test]
     fn target_features() {
         let features = RustFeatures::from(RustTarget::Stable_1_71);