File rapidquilt-no-IntErrorKind.patch of Package rapidquilt

Overview Repositories Revisions Requests Users Attributes Meta

File rapidquilt-no-IntErrorKind.patch of Package rapidquilt (Revision 8c7e31bb775a7d14658b1a789397f5b9)

Currently displaying revision 8c7e31bb775a7d14658b1a789397f5b9 , Show latest

From: Petr Tesarik <ptesarik@suse.com>
Date: Fri May 13 15:29:29 2022 +0200
Subject: Do not use IntErrorKind
Upstream: merged
Git-commit: 3e54e09ce5706612402db0a5fbdf14929c3f0dfa

IntErrorKind was still unstable in Rust 1.54.

Signed-off-by: Petr Tesarik <ptesarik@suse.com>

---
 src/libpatch/patch/unified/parser.rs |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- a/src/libpatch/patch/unified/parser.rs
+++ b/src/libpatch/patch/unified/parser.rs
@@ -2,7 +2,6 @@
 
 use std::borrow::Cow;
 use std::fs::Permissions;
-use std::num::IntErrorKind;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::vec::Vec;
@@ -887,13 +886,13 @@ fn test_parse_git_patch_line() {
 
 fn parse_number_usize(input: &[u8]) -> Result<(&[u8], usize), ErrorBuilder> {
     let (digits, input_) = split_at_cond(input, |c| !is_digit(c));
+    if digits.is_empty() {
+        return Err(ErrorBuilder::BadNumber(input));
+    }
     let str = std::str::from_utf8(&digits).unwrap(); // NOTE(unwrap): We know it is just digits 0-9, so it is guaranteed to be valid UTF8.
     match usize::from_str(str) {
         Ok(number) => Ok((input_, number)),
-        Err(err) => Err(match err.kind() {
-            IntErrorKind::PosOverflow => ErrorBuilder::NumberTooBig(digits),
-            _ => ErrorBuilder::BadNumber(input),
-        })
+        Err(_) => Err(ErrorBuilder::NumberTooBig(digits)),
     }
 }

Places

File rapidquilt-no-IntErrorKind.patch of Package rapidquilt (Revision 8c7e31bb775a7d14658b1a789397f5b9)

Places