From a979cf9bb8c3ddeec212d31ef45665c61e9c0081 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Mon, 6 Jun 2022 14:09:24 -0500
Subject: [PATCH] fix(parser): Deprecate max_occurrences

---
 src/builder/arg.rs                    | 54 +++------------------------
 tests/builder/multiple_occurrences.rs |  3 ++
 2 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/src/builder/arg.rs b/src/builder/arg.rs
index 46dd47bcfb8..0f4190c27be 100644
--- a/src/builder/arg.rs
+++ b/src/builder/arg.rs
@@ -831,57 +831,13 @@ impl<'help> Arg<'help> {
         }
     }
 
-    /// The *maximum* number of occurrences for this argument.
-    ///
-    /// For example, if you had a
-    /// `-v` flag and you wanted up to 3 levels of verbosity you would set `.max_occurrences(3)`, and
-    /// this argument would be satisfied if the user provided it once or twice or thrice.
-    ///
-    /// **NOTE:** This implicitly sets [`Arg::multiple_occurrences(true)`] if the value is greater than 1.
-    /// # Examples
-    ///
-    /// ```rust
-    /// # use clap::{Command, Arg};
-    /// Arg::new("verbosity")
-    ///     .short('v')
-    ///     .max_occurrences(3);
-    /// ```
-    ///
-    /// Supplying less than the maximum number of arguments is allowed
-    ///
-    /// ```rust
-    /// # use clap::{Command, Arg};
-    /// let res = Command::new("prog")
-    ///     .arg(Arg::new("verbosity")
-    ///         .max_occurrences(3)
-    ///         .short('v'))
-    ///     .try_get_matches_from(vec![
-    ///         "prog", "-vvv"
-    ///     ]);
-    ///
-    /// assert!(res.is_ok());
-    /// let m = res.unwrap();
-    /// assert_eq!(m.occurrences_of("verbosity"), 3);
-    /// ```
-    ///
-    /// Supplying more than the maximum number of arguments is an error
-    ///
-    /// ```rust
-    /// # use clap::{Command, Arg, ErrorKind};
-    /// let res = Command::new("prog")
-    ///     .arg(Arg::new("verbosity")
-    ///         .max_occurrences(2)
-    ///         .short('v'))
-    ///     .try_get_matches_from(vec![
-    ///         "prog", "-vvv"
-    ///     ]);
-    ///
-    /// assert!(res.is_err());
-    /// assert_eq!(res.unwrap_err().kind(), ErrorKind::TooManyOccurrences);
-    /// ```
-    /// [`Arg::multiple_occurrences(true)`]: Arg::multiple_occurrences()
+    /// Deprecated, for flags this is replaced with `action(ArgAction::Count).value_parser(value_parser!(u64).range(..max))`
     #[inline]
     #[must_use]
+    #[deprecated(
+        since = "3.2.0",
+        note = "For flags, replaced with `action(ArgAction::Count).value_parser(value_parser!(u64).range(..max))`"
+    )]
     pub fn max_occurrences(mut self, qty: usize) -> Self {
         self.max_occurs = Some(qty);
         if qty > 1 {
diff --git a/tests/builder/multiple_occurrences.rs b/tests/builder/multiple_occurrences.rs
index e3f087a96b0..d04149191a9 100644
--- a/tests/builder/multiple_occurrences.rs
+++ b/tests/builder/multiple_occurrences.rs
@@ -162,6 +162,7 @@ fn multiple_occurrences_of_after_env() {
 }
 
 #[test]
+#[allow(deprecated)]
 fn max_occurrences_implies_multiple_occurrences() {
     let cmd = Command::new("prog").arg(
         Arg::new("verbose")
@@ -189,6 +190,7 @@ fn max_occurrences_implies_multiple_occurrences() {
 }
 
 #[test]
+#[allow(deprecated)]
 fn max_occurrences_try_inputs() {
     let cmd = Command::new("prog").arg(
         Arg::new("verbose")
@@ -226,6 +228,7 @@ fn max_occurrences_try_inputs() {
 }
 
 #[test]
+#[allow(deprecated)]
 fn max_occurrences_positional() {
     let cmd = Command::new("prog").arg(Arg::new("verbose").max_occurrences(3));
     let m = cmd.clone().try_get_matches_from(vec!["prog", "v"]);