single option

Author: jsgf

compiler/rustc_mir_transform/src/annotate_moves.rs

@@ -38,7 +38,8 @@ pub(crate) struct AnnotateMoves;
 
 impl<'tcx> crate::MirPass<'tcx> for AnnotateMoves {
     fn is_enabled(&self, sess: &rustc_session::Session) -> bool {
-        sess.opts.unstable_opts.annotate_moves && sess.opts.debuginfo != DebugInfo::None
+        sess.opts.unstable_opts.annotate_moves.is_enabled()
+            && sess.opts.debuginfo != DebugInfo::None
     }
 
     fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
@@ -52,7 +53,8 @@ impl<'tcx> crate::MirPass<'tcx> for AnnotateMoves {
             .sess
             .opts
             .unstable_opts
-            .annotate_moves_size_limit
+            .annotate_moves
+            .size_limit()
             .unwrap_or(DEFAULT_ANNOTATE_MOVES_SIZE_LIMIT);
 
         // Common params, including selectively borrowing the bits of Body we need to avoid

compiler/rustc_session/src/config.rs

@@ -219,6 +219,29 @@ pub enum CoverageLevel {
     Condition,
 }
 
+/// The different settings that the `-Z annotate-moves` flag can have.
+#[derive(Clone, Copy, PartialEq, Hash, Debug)]
+pub enum AnnotateMoves {
+    /// `-Z annotate-moves=no` (or `off`, `false` etc.)
+    Disabled,
+    /// `-Z annotate-moves` or `-Z annotate-moves=yes` (use default size limit)
+    /// `-Z annotate-moves=SIZE` (use specified size limit)
+    Enabled(Option<u64>),
+}
+
+impl AnnotateMoves {
+    pub fn is_enabled(&self) -> bool {
+        matches!(self, AnnotateMoves::Enabled(_))
+    }
+
+    pub fn size_limit(&self) -> Option<u64> {
+        match self {
+            AnnotateMoves::Disabled => None,
+            AnnotateMoves::Enabled(limit) => *limit,
+        }
+    }
+}
+
 // The different settings that the `-Z offload` flag can have.
 #[derive(Clone, Copy, PartialEq, Hash, Debug)]
 pub enum Offload {
@@ -3227,13 +3250,13 @@ pub(crate) mod dep_tracking {
     };
 
     use super::{
-        AutoDiff, BranchProtection, CFGuard, CFProtection, CollapseMacroDebuginfo, CoverageOptions,
-        CrateType, DebugInfo, DebugInfoCompression, ErrorOutputType, FmtDebug, FunctionReturn,
-        InliningThreshold, InstrumentCoverage, InstrumentXRay, LinkerPluginLto, LocationDetail,
-        LtoCli, MirStripDebugInfo, NextSolverConfig, Offload, OomStrategy, OptLevel, OutFileName,
-        OutputType, OutputTypes, PatchableFunctionEntry, Polonius, RemapPathScopeComponents,
-        ResolveDocLinks, SourceFileHashAlgorithm, SplitDwarfKind, SwitchWithOptPath,
-        SymbolManglingVersion, WasiExecModel,
+        AnnotateMoves, AutoDiff, BranchProtection, CFGuard, CFProtection, CollapseMacroDebuginfo,
+        CoverageOptions, CrateType, DebugInfo, DebugInfoCompression, ErrorOutputType, FmtDebug,
+        FunctionReturn, InliningThreshold, InstrumentCoverage, InstrumentXRay, LinkerPluginLto,
+        LocationDetail, LtoCli, MirStripDebugInfo, NextSolverConfig, Offload, OomStrategy,
+        OptLevel, OutFileName, OutputType, OutputTypes, PatchableFunctionEntry, Polonius,
+        RemapPathScopeComponents, ResolveDocLinks, SourceFileHashAlgorithm, SplitDwarfKind,
+        SwitchWithOptPath, SymbolManglingVersion, WasiExecModel,
     };
     use crate::lint;
     use crate::utils::NativeLib;
@@ -3276,6 +3299,7 @@ pub(crate) mod dep_tracking {
 
     impl_dep_tracking_hash_via_hash!(
         (),
+        AnnotateMoves,
         AutoDiff,
         Offload,
         bool,

compiler/rustc_session/src/options.rs

@@ -790,6 +790,8 @@ mod desc {
     pub(crate) const parse_opt_langid: &str = "a language identifier";
     pub(crate) const parse_opt_pathbuf: &str = "a path";
     pub(crate) const parse_list: &str = "a space-separated list of strings";
+    pub(crate) const parse_annotate_moves: &str =
+        "either a boolean (`y`, `yes`, `on`, `true`, `n`, `no`, `off` or `false`), or a number";
     pub(crate) const parse_list_with_polarity: &str =
         "a comma-separated list of strings, with elements beginning with + or -";
     pub(crate) const parse_autodiff: &str = "a comma separated list of settings: `Enable`, `PrintSteps`, `PrintTA`, `PrintTAFn`, `PrintAA`, `PrintPerf`, `PrintModBefore`, `PrintModAfter`, `PrintModFinal`, `PrintPasses`, `NoPostopt`, `LooseTypes`, `Inline`";
@@ -1633,6 +1635,38 @@ pub mod parse {
         true
     }
 
+    pub(crate) fn parse_annotate_moves(slot: &mut AnnotateMoves, v: Option<&str>) -> bool {
+        match v {
+            // No value provided: -Z annotate-moves (enable with default limit)
+            None => {
+                *slot = AnnotateMoves::Enabled(None);
+                true
+            }
+            Some(s) => {
+                // Try to parse as boolean first
+                match s {
+                    "y" | "yes" | "on" | "true" => {
+                        *slot = AnnotateMoves::Enabled(None);
+                        return true;
+                    }
+                    "n" | "no" | "off" | "false" => {
+                        *slot = AnnotateMoves::Disabled;
+                        return true;
+                    }
+                    _ => {}
+                }
+
+                // Try to parse as number (size limit)
+                if let Ok(size_limit) = s.parse::<u64>() {
+                    *slot = AnnotateMoves::Enabled(Some(size_limit));
+                    true
+                } else {
+                    false
+                }
+            }
+        }
+    }
+
     pub(crate) fn parse_lto(slot: &mut LtoCli, v: Option<&str>) -> bool {
         if v.is_some() {
             let mut bool_arg = None;
@@ -2384,12 +2418,9 @@ options! {
         "print some statistics about AST and HIR (default: no)"),
     instrument_mcount: bool = (false, parse_bool, [TRACKED],
         "insert function instrument code for mcount-based tracing (default: no)"),
-    annotate_moves: bool = (false, parse_bool, [TRACKED],
+    annotate_moves: AnnotateMoves = (AnnotateMoves::Disabled, parse_annotate_moves, [TRACKED],
         "emit debug info for compiler-generated move and copy operations \
-        to make them visible in profilers (default: no)"),
-    annotate_moves_size_limit: Option<u64> = (None, parse_opt_number, [TRACKED],
-        "the minimum size object to annotate move/copy operations \
-        (default: 65 bytes)"),
+        to make them visible in profilers. Can be a boolean or a size limit in bytes (default: disabled)"),
     instrument_xray: Option<InstrumentXRay> = (None, parse_instrument_xray, [TRACKED],
         "insert function instrument code for XRay-based tracing (default: no)
          Optional extra settings:

src/doc/unstable-book/src/compiler-flags/annotate-moves.md

@@ -12,26 +12,34 @@ their presence in debug info makes expensive memory operations visible in profil
 ## Syntax
 
 ```bash
-rustc -Z annotate-moves[=<boolean>]
-rustc -Z annotate-moves-size-limit=<bytes>
+rustc -Z annotate-moves[=<value>]
 ```
 
+Where `<value>` can be:
+- A boolean: `true`, `false`, `yes`, `no`, `on`, `off`
+- A number: size threshold in bytes (e.g., `128`)
+- Omitted: enables with default threshold (65 bytes)
+
 ## Options
 
-- `-Z annotate-moves`: Enable/disable move/copy annotation (default: `false`)
-- `-Z annotate-moves-size-limit=N`: Only annotate operations on types >= N bytes (default: 65 bytes)
+- `-Z annotate-moves` or `-Z annotate-moves=true`: Enable with default size limit (65 bytes)
+- `-Z annotate-moves=false`: Disable annotation
+- `-Z annotate-moves=N`: Enable with custom size limit of N bytes
 
 ## Examples
 
 ```bash
-# Enable annotation with default threshold (pointer size)
+# Enable annotation with default threshold (65 bytes)
 rustc -Z annotate-moves main.rs
 
 # Enable with custom 128-byte threshold
-rustc -Z annotate-moves -Z annotate-moves-size-limit=128 main.rs
+rustc -Z annotate-moves=128 main.rs
 
 # Only annotate very large moves (1KB+)
-rustc -Z annotate-moves -Z annotate-moves-size-limit=1024 main.rs
+rustc -Z annotate-moves=1024 main.rs
+
+# Explicitly disable
+rustc -Z annotate-moves=false main.rs
 ```
 
 ## Behavior

tests/codegen-llvm/annotate-moves/annotate-moves-integration.rs

@@ -1,4 +1,4 @@
-//@ compile-flags: -Z annotate-moves -Z annotate-moves-size-limit=50 -Copt-level=0 -g
+//@ compile-flags: -Z annotate-moves=50 -Copt-level=0 -g
 
 #![crate_type = "lib"]
 

tests/codegen-llvm/annotate-moves/annotate-moves-size-limit.rs

@@ -1,5 +1,5 @@
 //
-//@ compile-flags: -Z annotate-moves -Z annotate-moves-size-limit=100 -Copt-level=0 -g
+//@ compile-flags: -Z annotate-moves=100 -Copt-level=0 -g
 
 #![crate_type = "lib"]
 

tests/mir-opt/annotate-moves/async.rs

@@ -1,4 +1,4 @@
-//@ compile-flags: -Z annotate-moves -Z annotate-moves-size-limit=1 -C debuginfo=full
+//@ compile-flags: -Z annotate-moves=1 -C debuginfo=full
 //@ ignore-std-debug-assertions
 //@ edition: 2021
 

tests/mir-opt/annotate-moves/basic.rs

@@ -1,4 +1,4 @@
-//@ compile-flags: -Z annotate-moves -Z annotate-moves-size-limit=8 -C debuginfo=full
+//@ compile-flags: -Z annotate-moves=8 -C debuginfo=full
 //@ ignore-std-debug-assertions
 //@ edition: 2021
 

tests/mir-opt/annotate-moves/iter.rs

@@ -1,4 +1,4 @@
-//@ compile-flags: -Z annotate-moves -Z annotate-moves-size-limit=8 -C debuginfo=full
+//@ compile-flags: -Z annotate-moves=8 -C debuginfo=full
 //@ ignore-std-debug-assertions
 //@ edition: 2021
 

tests/ui/annotate-moves/annotate-moves-basic.rs

@@ -1,5 +1,5 @@
 //@ check-pass
-//@ compile-flags: -Z annotate-moves -Z annotate-moves-size-limit=100
+//@ compile-flags: -Z annotate-moves=100
 
 // Test that valid annotate-moves flags are accepted