make Options::apply fallible

BenWiederhake · cakebaker · commit dca1347b7436 · 2025-04-01T10:37:50.000+02:00
diff --git a/README.md b/README.md
@@ -67,11 +67,12 @@ struct Settings {
 // To implement `Options`, we only need to provide the `apply` method.
 // The `parse` method will be automatically generated.
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Caps => self.caps = true,
             Arg::ExclamationMarks(n) => self.exclamation_marks += n,
         }
+        Ok(())
     }
 }
 
diff --git a/docs/guide/port.md b/docs/guide/port.md
@@ -94,10 +94,11 @@ enum Arg {
 struct Settings { a: bool }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::A => self.a = true,
         }
+        Ok(())
     }
 }
 
@@ -137,10 +138,11 @@ impl Default for Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::A => self.a = false,
         }
+        Ok(())
     }
 }
 
@@ -175,10 +177,11 @@ enum Arg {
 struct Settings { a: u8 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::A => self.a += 1,
         }
+        Ok(())
     }
 }
 
@@ -215,10 +218,11 @@ enum Arg {
 struct Settings { a: OsString }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::A(s) => self.a = s,
         }
+        Ok(())
     }
 }
 
@@ -255,10 +259,11 @@ enum Arg {
 struct Settings { a: Vec<OsString> }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::A(s) => self.a.push(s),
         }
+        Ok(())
     }
 }
 
@@ -271,4 +276,4 @@ let a = Settings::default().parse(std::env::args_os()).unwrap().0.a;
 [Up](super)
 [Next](next)
 
-</div>
+</div>
diff --git a/docs/guide/quick.md b/docs/guide/quick.md
@@ -59,10 +59,11 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Force => self.force = true,
         }
+        Ok(())
     }
 }
 
@@ -100,11 +101,12 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Force => self.force = true,
             Arg::NoForce => self.force = false,
         }
+        Ok(())
     }
 }
 
@@ -160,10 +162,11 @@ enum Arg {
 # }
 #
 # impl Options<Arg> for Settings {
-#     fn apply(&mut self, arg: Arg) {
+#     fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
 #         match arg {
 #             Arg::Name(name) => self.name = name,
 #         }
+#         Ok(())
 #     }
 # }
 #
@@ -197,10 +200,11 @@ enum Arg {
 # }
 #
 # impl Options<Arg> for Settings {
-#     fn apply(&mut self, arg: Arg) {
+#     fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
 #         match arg {
 #             Arg::Name(name) => self.name = name,
 #         }
+#         Ok(())
 #     }
 # }
 #
@@ -234,10 +238,11 @@ enum Arg {
 # }
 #
 # impl Options<Arg> for Settings {
-#     fn apply(&mut self, arg: Arg) {
+#     fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
 #         match arg {
 #             Arg::Force(b) => self.force = b,
 #         }
+#         Ok(())
 #     }
 # }
 #
@@ -269,10 +274,11 @@ enum Arg {
 # }
 #
 # impl Options<Arg> for Settings {
-#     fn apply(&mut self, arg: Arg) {
+#     fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
 #         match arg {
 #             Arg::Sort(s) => self.sort = s,
 #         }
+#         Ok(())
 #     }
 # }
 #
@@ -287,4 +293,4 @@ enum Arg {
 [Up](super)
 [Next](next)
 
-</div>
+</div>
diff --git a/examples/completion.rs b/examples/completion.rs
@@ -33,7 +33,7 @@ enum Arg {
 struct Settings;
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, _arg: Arg) {
+    fn apply(&mut self, _arg: Arg) -> Result<(), uutils_args::Error> {
         panic!("Compile with the 'parse-is-complete' feature!")
     }
 }
diff --git a/examples/deprecated.rs b/examples/deprecated.rs
@@ -34,11 +34,12 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Min(n) => self.n1 = n,
             Arg::Plus(n) => self.n2 = n,
         }
+        Ok(())
     }
 }
 
diff --git a/examples/hello_world.rs b/examples/hello_world.rs
@@ -22,12 +22,13 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Name(n) => self.name = n,
             Arg::Count(c) => self.count = c,
             Arg::Hidden => {}
         }
+        Ok(())
     }
 }
 
diff --git a/examples/value.rs b/examples/value.rs
@@ -25,10 +25,11 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Color(c) => self.color = c,
         }
+        Ok(())
     }
 }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -166,7 +166,7 @@ impl<T: Arguments> ArgumentIter<T> {
 /// call [`Options::apply`] on the result until the arguments are exhausted.
 pub trait Options<Arg: Arguments>: Sized {
     /// Apply a single argument to the options.
-    fn apply(&mut self, arg: Arg);
+    fn apply(&mut self, arg: Arg) -> Result<(), Error>;
 
     /// Parse an iterator of arguments into the options
     #[allow(unused_mut)]
@@ -191,7 +191,7 @@ pub trait Options<Arg: Arguments>: Sized {
         {
             let mut iter = ArgumentIter::<Arg>::from_args(args);
             while let Some(arg) = iter.next_arg()? {
-                self.apply(arg);
+                self.apply(arg)?;
             }
             Ok((self, iter.positional_arguments))
         }
diff --git a/tests/coreutils/b2sum.rs b/tests/coreutils/b2sum.rs
@@ -46,7 +46,7 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Binary => self.binary = true,
             Arg::Check => self.check = true,
@@ -57,6 +57,7 @@ impl Options<Arg> for Settings {
             Arg::Strict => self.strict = true,
             Arg::Warn => self.check_output = CheckOutput::Warn,
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/base32.rs b/tests/coreutils/base32.rs
@@ -34,13 +34,14 @@ impl Default for Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Decode => self.decode = true,
             Arg::IgnoreGarbage => self.ignore_garbage = true,
             Arg::Wrap(0) => self.wrap = None,
             Arg::Wrap(x) => self.wrap = Some(x),
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/basename.rs b/tests/coreutils/basename.rs
@@ -26,7 +26,7 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Multiple => self.multiple = true,
             Arg::Suffix(s) => {
@@ -35,6 +35,7 @@ impl Options<Arg> for Settings {
             }
             Arg::Zero => self.zero = true,
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/cat.rs b/tests/coreutils/cat.rs
@@ -48,7 +48,7 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::ShowAll => {
                 self.show_tabs = true;
@@ -70,6 +70,7 @@ impl Options<Arg> for Settings {
             Arg::NumberNonblank => self.number = NumberingMode::NonEmpty,
             Arg::SqueezeBlank => self.squeeze_blank = true,
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/cksum.rs b/tests/coreutils/cksum.rs
@@ -30,7 +30,7 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Binary => self.binary = Tristate::True,
             Arg::Text => self.binary = Tristate::False,
@@ -47,6 +47,7 @@ impl Options<Arg> for Settings {
                 self.tag = Tristate::False;
             }
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/dd.rs b/tests/coreutils/dd.rs
@@ -92,7 +92,7 @@ impl Default for Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Infile(f) => self.infile = Some(f),
             Arg::Outfile(f) => self.outfile = Some(f),
@@ -111,6 +111,7 @@ impl Options<Arg> for Settings {
             Arg::Iflag(_f) => todo!(),
             Arg::Oflag(_f) => todo!(),
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/echo.rs b/tests/coreutils/echo.rs
@@ -24,12 +24,13 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::NoNewline => self.trailing_newline = false,
             Arg::EnableEscape => self.escape = true,
             Arg::DisableEscape => self.escape = false,
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/head.rs b/tests/coreutils/head.rs
@@ -188,7 +188,7 @@ struct Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::Bytes(n) => {
                 self.mode = Mode::Bytes;
@@ -202,6 +202,7 @@ impl Options<Arg> for Settings {
             Arg::Verbose => self.verbose = true,
             Arg::Zero => self.zero = true,
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/ls.rs b/tests/coreutils/ls.rs
@@ -360,7 +360,7 @@ impl Default for Settings {
 }
 
 impl Options<Arg> for Settings {
-    fn apply(&mut self, arg: Arg) {
+    fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {
         match arg {
             Arg::All => self.which_files = Files::All,
             Arg::AlmostAll => self.which_files = Files::AlmostAll,
@@ -417,6 +417,7 @@ impl Options<Arg> for Settings {
             }
             Arg::GroupDirectoriesFirst => self.group_directories_first = true,
         }
+        Ok(())
     }
 }
 
diff --git a/tests/coreutils/mktemp.rs b/tests/coreutils/mktemp.rs
diff --git a/tests/coreutils/shuf.rs b/tests/coreutils/shuf.rs
diff --git a/tests/coreutils/tail.rs b/tests/coreutils/tail.rs
diff --git a/tests/coreutils/uniq.rs b/tests/coreutils/uniq.rs
diff --git a/tests/flags.rs b/tests/flags.rs
diff --git a/tests/options.rs b/tests/options.rs
diff --git a/tests/options_first.rs b/tests/options_first.rs

Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,12 @@ struct Settings {`
`67`	`67`	// To implement `Options`, we only need to provide the `apply` method.
`68`	`68`	// The `parse` method will be automatically generated.
`69`	`69`	`impl Options<Arg> for Settings {`
`70`		`- fn apply(&mut self, arg: Arg) {`
	`70`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`71`	`71`	`match arg {`
`72`	`72`	`Arg::Caps => self.caps = true,`
`73`	`73`	`Arg::ExclamationMarks(n) => self.exclamation_marks += n,`
`74`	`74`	`}`
	`75`	`+ Ok(())`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,11 @@ enum Arg {`
`94`	`94`	`struct Settings { a: bool }`
`95`	`95`
`96`	`96`	`impl Options<Arg> for Settings {`
`97`		`- fn apply(&mut self, arg: Arg) {`
	`97`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`98`	`98`	`match arg {`
`99`	`99`	`Arg::A => self.a = true,`
`100`	`100`	`}`
	`101`	`+ Ok(())`
`101`	`102`	`}`
`102`	`103`	`}`
`103`	`104`
`@@ -137,10 +138,11 @@ impl Default for Settings {`
`137`	`138`	`}`
`138`	`139`
`139`	`140`	`impl Options<Arg> for Settings {`
`140`		`- fn apply(&mut self, arg: Arg) {`
	`141`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`141`	`142`	`match arg {`
`142`	`143`	`Arg::A => self.a = false,`
`143`	`144`	`}`
	`145`	`+ Ok(())`
`144`	`146`	`}`
`145`	`147`	`}`
`146`	`148`
`@@ -175,10 +177,11 @@ enum Arg {`
`175`	`177`	`struct Settings { a: u8 }`
`176`	`178`
`177`	`179`	`impl Options<Arg> for Settings {`
`178`		`- fn apply(&mut self, arg: Arg) {`
	`180`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`179`	`181`	`match arg {`
`180`	`182`	`Arg::A => self.a += 1,`
`181`	`183`	`}`
	`184`	`+ Ok(())`
`182`	`185`	`}`
`183`	`186`	`}`
`184`	`187`
`@@ -215,10 +218,11 @@ enum Arg {`
`215`	`218`	`struct Settings { a: OsString }`
`216`	`219`
`217`	`220`	`impl Options<Arg> for Settings {`
`218`		`- fn apply(&mut self, arg: Arg) {`
	`221`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`219`	`222`	`match arg {`
`220`	`223`	`Arg::A(s) => self.a = s,`
`221`	`224`	`}`
	`225`	`+ Ok(())`
`222`	`226`	`}`
`223`	`227`	`}`
`224`	`228`
`@@ -255,10 +259,11 @@ enum Arg {`
`255`	`259`	`struct Settings { a: Vec<OsString> }`
`256`	`260`
`257`	`261`	`impl Options<Arg> for Settings {`
`258`		`- fn apply(&mut self, arg: Arg) {`
	`262`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`259`	`263`	`match arg {`
`260`	`264`	`Arg::A(s) => self.a.push(s),`
`261`	`265`	`}`
	`266`	`+ Ok(())`
`262`	`267`	`}`
`263`	`268`	`}`
`264`	`269`
`@@ -271,4 +276,4 @@ let a = Settings::default().parse(std::env::args_os()).unwrap().0.a;`
`271`	`276`	`[Up](super)`
`272`	`277`	`[Next](next)`
`273`	`278`
`274`		`-</div>`
	`279`	`+</div>`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,11 @@ struct Settings {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`impl Options<Arg> for Settings {`
`62`		`- fn apply(&mut self, arg: Arg) {`
	`62`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`63`	`63`	`match arg {`
`64`	`64`	`Arg::Force => self.force = true,`
`65`	`65`	`}`
	`66`	`+ Ok(())`
`66`	`67`	`}`
`67`	`68`	`}`
`68`	`69`
`@@ -100,11 +101,12 @@ struct Settings {`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`impl Options<Arg> for Settings {`
`103`		`- fn apply(&mut self, arg: Arg) {`
	`104`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`104`	`105`	`match arg {`
`105`	`106`	`Arg::Force => self.force = true,`
`106`	`107`	`Arg::NoForce => self.force = false,`
`107`	`108`	`}`
	`109`	`+ Ok(())`
`108`	`110`	`}`
`109`	`111`	`}`
`110`	`112`
`@@ -160,10 +162,11 @@ enum Arg {`
`160`	`162`	`# }`
`161`	`163`	`#`
`162`	`164`	`# impl Options<Arg> for Settings {`
`163`		`-# fn apply(&mut self, arg: Arg) {`
	`165`	`+# fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`164`	`166`	`# match arg {`
`165`	`167`	`# Arg::Name(name) => self.name = name,`
`166`	`168`	`# }`
	`169`	`+# Ok(())`
`167`	`170`	`# }`
`168`	`171`	`# }`
`169`	`172`	`#`
`@@ -197,10 +200,11 @@ enum Arg {`
`197`	`200`	`# }`
`198`	`201`	`#`
`199`	`202`	`# impl Options<Arg> for Settings {`
`200`		`-# fn apply(&mut self, arg: Arg) {`
	`203`	`+# fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`201`	`204`	`# match arg {`
`202`	`205`	`# Arg::Name(name) => self.name = name,`
`203`	`206`	`# }`
	`207`	`+# Ok(())`
`204`	`208`	`# }`
`205`	`209`	`# }`
`206`	`210`	`#`
`@@ -234,10 +238,11 @@ enum Arg {`
`234`	`238`	`# }`
`235`	`239`	`#`
`236`	`240`	`# impl Options<Arg> for Settings {`
`237`		`-# fn apply(&mut self, arg: Arg) {`
	`241`	`+# fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`238`	`242`	`# match arg {`
`239`	`243`	`# Arg::Force(b) => self.force = b,`
`240`	`244`	`# }`
	`245`	`+# Ok(())`
`241`	`246`	`# }`
`242`	`247`	`# }`
`243`	`248`	`#`
`@@ -269,10 +274,11 @@ enum Arg {`
`269`	`274`	`# }`
`270`	`275`	`#`
`271`	`276`	`# impl Options<Arg> for Settings {`
`272`		`-# fn apply(&mut self, arg: Arg) {`
	`277`	`+# fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`273`	`278`	`# match arg {`
`274`	`279`	`# Arg::Sort(s) => self.sort = s,`
`275`	`280`	`# }`
	`281`	`+# Ok(())`
`276`	`282`	`# }`
`277`	`283`	`# }`
`278`	`284`	`#`
`@@ -287,4 +293,4 @@ enum Arg {`
`287`	`293`	`[Up](super)`
`288`	`294`	`[Next](next)`
`289`	`295`
`290`		`-</div>`
	`296`	`+</div>`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ enum Arg {`
`33`	`33`	`struct Settings;`
`34`	`34`
`35`	`35`	`impl Options<Arg> for Settings {`
`36`		`- fn apply(&mut self, _arg: Arg) {`
	`36`	`+ fn apply(&mut self, _arg: Arg) -> Result<(), uutils_args::Error> {`
`37`	`37`	`panic!("Compile with the 'parse-is-complete' feature!")`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,12 @@ struct Settings {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`impl Options<Arg> for Settings {`
`37`		`- fn apply(&mut self, arg: Arg) {`
	`37`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`38`	`38`	`match arg {`
`39`	`39`	`Arg::Min(n) => self.n1 = n,`
`40`	`40`	`Arg::Plus(n) => self.n2 = n,`
`41`	`41`	`}`
	`42`	`+ Ok(())`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,13 @@ struct Settings {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`impl Options<Arg> for Settings {`
`25`		`- fn apply(&mut self, arg: Arg) {`
	`25`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`26`	`26`	`match arg {`
`27`	`27`	`Arg::Name(n) => self.name = n,`
`28`	`28`	`Arg::Count(c) => self.count = c,`
`29`	`29`	`Arg::Hidden => {}`
`30`	`30`	`}`
	`31`	`+ Ok(())`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,11 @@ struct Settings {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`impl Options<Arg> for Settings {`
`28`		`- fn apply(&mut self, arg: Arg) {`
	`28`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`29`	`29`	`match arg {`
`30`	`30`	`Arg::Color(c) => self.color = c,`
`31`	`31`	`}`
	`32`	`+ Ok(())`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ impl<T: Arguments> ArgumentIter<T> {`
`166`	`166`	/// call [`Options::apply`] on the result until the arguments are exhausted.
`167`	`167`	`pub trait Options<Arg: Arguments>: Sized {`
`168`	`168`	`/// Apply a single argument to the options.`
`169`		`- fn apply(&mut self, arg: Arg);`
	`169`	`+ fn apply(&mut self, arg: Arg) -> Result<(), Error>;`
`170`	`170`
`171`	`171`	`/// Parse an iterator of arguments into the options`
`172`	`172`	`#[allow(unused_mut)]`
`@@ -191,7 +191,7 @@ pub trait Options<Arg: Arguments>: Sized {`
`191`	`191`	`{`
`192`	`192`	`let mut iter = ArgumentIter::<Arg>::from_args(args);`
`193`	`193`	`while let Some(arg) = iter.next_arg()? {`
`194`		`- self.apply(arg);`
	`194`	`+ self.apply(arg)?;`
`195`	`195`	`}`
`196`	`196`	`Ok((self, iter.positional_arguments))`
`197`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ struct Settings {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`impl Options<Arg> for Settings {`
`49`		`- fn apply(&mut self, arg: Arg) {`
	`49`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`50`	`50`	`match arg {`
`51`	`51`	`Arg::Binary => self.binary = true,`
`52`	`52`	`Arg::Check => self.check = true,`
`@@ -57,6 +57,7 @@ impl Options<Arg> for Settings {`
`57`	`57`	`Arg::Strict => self.strict = true,`
`58`	`58`	`Arg::Warn => self.check_output = CheckOutput::Warn,`
`59`	`59`	`}`
	`60`	`+ Ok(())`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`
Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,14 @@ impl Default for Settings {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`impl Options<Arg> for Settings {`
`37`		`- fn apply(&mut self, arg: Arg) {`
	`37`	`+ fn apply(&mut self, arg: Arg) -> Result<(), uutils_args::Error> {`
`38`	`38`	`match arg {`
`39`	`39`	`Arg::Decode => self.decode = true,`
`40`	`40`	`Arg::IgnoreGarbage => self.ignore_garbage = true,`
`41`	`41`	`Arg::Wrap(0) => self.wrap = None,`
`42`	`42`	`Arg::Wrap(x) => self.wrap = Some(x),`
`43`	`43`	`}`
	`44`	`+ Ok(())`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`