transpile: rename minimal to conservative for --translate-const-macros

Author: kkysen

c2rust-transpile/src/lib.rs

@@ -49,8 +49,8 @@ pub enum TranslateMacros {
     #[default]
     None,
 
-    /// Translate the minimal subset of macros known to always work.
-    Minimal,
+    /// Translate the conservative subset of macros known to always work.
+    Conservative,
 
     /// Try to translate more, but this is experimental and not guaranteed to work.
     ///

c2rust-transpile/src/translator/mod.rs

@@ -2166,9 +2166,11 @@ impl<'c> Translation<'c> {
         let kind = &self.ast_context[expr_id].kind;
         match self.tcfg.translate_const_macros {
             TranslateMacros::None => Err(format_err!("translate_const_macros is None"))?,
-            TranslateMacros::Minimal => match *kind {
+            TranslateMacros::Conservative => match *kind {
                 CExprKind::Literal(..) => Ok(()), // Literals are leaf expressions, so they should always be const-compatible.
-                _ => Err(format_err!("minimal const macros don't yet allow {kind:?}"))?,
+                _ => Err(format_err!(
+                    "conservative const macros don't yet allow {kind:?}"
+                ))?,
             },
             TranslateMacros::Experimental => Ok(()),
         }
@@ -4177,7 +4179,7 @@ impl<'c> Translation<'c> {
     ) -> Option<WithStmts<Box<Expr>>> {
         match self.tcfg.translate_fn_macros {
             TranslateMacros::None => return None,
-            TranslateMacros::Minimal => return None, // Nothing is supported for `Minimal` yet.
+            TranslateMacros::Conservative => return None, // Nothing is supported for `Conservative` yet.
             TranslateMacros::Experimental => {}
         }
 

c2rust-transpile/tests/snapshots.rs

@@ -36,8 +36,8 @@ fn config() -> TranspilerConfig {
         enabled_warnings: Default::default(),
         emit_no_std: false,
         output_dir: None,
-        translate_const_macros: TranslateMacros::Minimal,
-        translate_fn_macros: TranslateMacros::Minimal,
+        translate_const_macros: TranslateMacros::Conservative,
+        translate_fn_macros: TranslateMacros::Conservative,
         disable_refactoring: false,
         preserve_unused_functions: false,
         log_level: log::LevelFilter::Warn,

c2rust/src/bin/c2rust-transpile.rs

@@ -165,8 +165,8 @@ pub enum TranslateMacros {
     #[default]
     None,
 
-    /// Translate the minimal subset of macros known to always work.
-    Minimal,
+    /// Translate the conservative subset of macros known to always work.
+    Conservative,
 
     /// Try to translate more, but this is experimental and not guaranteed to work.
     ///
@@ -179,7 +179,7 @@ impl From<TranslateMacros> for c2rust_transpile::TranslateMacros {
     fn from(this: TranslateMacros) -> Self {
         match this {
             TranslateMacros::None => c2rust_transpile::TranslateMacros::None,
-            TranslateMacros::Minimal => c2rust_transpile::TranslateMacros::Minimal,
+            TranslateMacros::Conservative => c2rust_transpile::TranslateMacros::Conservative,
             TranslateMacros::Experimental => c2rust_transpile::TranslateMacros::Experimental,
         }
     }