Merge pull request #447 from rustcoreutils/updates

Updates

Author: jgarzik

Cargo.lock

@@ -142,11 +142,13 @@ impl RecordReader for FileStream {
     }
 }
 
+#[cfg(test)]
 pub struct StringRecordReader {
     string: String,
     index: usize,
 }
 
+#[cfg(test)]
 impl<S: Into<String>> From<S> for StringRecordReader {
     fn from(value: S) -> Self {
         Self {
@@ -156,6 +158,7 @@ impl<S: Into<String>> From<S> for StringRecordReader {
     }
 }
 
+#[cfg(test)]
 impl Iterator for StringRecordReader {
     type Item = ReadResult;
 
@@ -170,6 +173,7 @@ impl Iterator for StringRecordReader {
     }
 }
 
+#[cfg(test)]
 impl RecordReader for StringRecordReader {
     fn is_done(&self) -> bool {
         self.index == self.string.len()

awk/interpreter/io.rs

@@ -1022,9 +1022,9 @@ struct CallFrame<'i> {
 
 /// # Invariants
 /// - `sp` and `bp` are pointers into the same
-///     contiguously allocated chunk of memory
+///   contiguously allocated chunk of memory
 /// - `stack_end` is one past the last valid pointer
-///     of the allocated memory starting at `bp`
+///   of the allocated memory starting at `bp`
 /// - values in the range [`bp`, `sp`) can be accessed safely
 struct Stack<'i, 's> {
     current_function_name: Rc<str>,
@@ -1761,7 +1761,7 @@ impl Interpreter {
                 .pop()
                 // there are no active references to stack values at this point, so this is safe
                 .map(|sv| unsafe { sv.into_owned() })
-                .unwrap_or(AwkValue::uninitialized()),
+                .unwrap_or_default(),
         ))
     }
 

awk/interpreter/mod.rs

@@ -82,7 +82,7 @@ impl Regex {
 
     /// Returns an iterator over all match locations in the string.
     /// Takes ownership of the CString.
-    pub fn match_locations(&self, string: CString) -> MatchIter {
+    pub fn match_locations(&self, string: CString) -> MatchIter<'_> {
         let s = string.into_string().unwrap_or_default();
         MatchIter {
             next_start: 0,

awk/regex.rs

@@ -361,9 +361,9 @@ impl Aarch64CodeGen {
         // Need space for: fp/lr (16 bytes) + GP callee-saved + FP callee-saved + local vars + reg save area
         // Round up callee-saved counts to even for 16-byte alignment
         // Note: AAPCS64 only requires the lower 64 bits of V8-V15 to be preserved (d8-d15)
-        let callee_saved_gp_pairs = (callee_saved.len() + 1) / 2;
+        let callee_saved_gp_pairs = callee_saved.len().div_ceil(2);
         let callee_saved_gp_size = callee_saved_gp_pairs as i32 * 16;
-        let callee_saved_fp_pairs = (callee_saved_fp.len() + 1) / 2;
+        let callee_saved_fp_pairs = callee_saved_fp.len().div_ceil(2);
         let callee_saved_fp_size = callee_saved_fp_pairs as i32 * 16; // 8 bytes per d-reg, 16 per pair
         let callee_saved_size = callee_saved_gp_size + callee_saved_fp_size;
         let total_frame = 16 + callee_saved_size + stack_size + reg_save_area_size;
@@ -2264,7 +2264,7 @@ impl Aarch64CodeGen {
         frame_size: i32,
     ) {
         let struct_size = insn.size; // Size in bits
-        let num_qwords = (struct_size + 63) / 64;
+        let num_qwords = struct_size.div_ceil(64);
 
         // Get source address (where the struct data is)
         let value_loc = self.get_location(value);

cc/arch/aarch64/codegen.rs

@@ -2696,7 +2696,7 @@ impl X86_64CodeGen {
     /// The value is a symbol containing the source struct data
     fn emit_struct_store(&mut self, insn: &Instruction, addr: PseudoId, value: PseudoId) {
         let struct_size = insn.size; // Size in bits
-        let num_qwords = (struct_size + 63) / 64;
+        let num_qwords = struct_size.div_ceil(64);
 
         // Get source address (where the struct data is)
         let value_loc = self.get_location(value);

cc/arch/x86_64/codegen.rs

@@ -291,7 +291,7 @@ fn process_file(
         let _ = std::fs::remove_file(&temp_asm);
 
         if !status.success() {
-            return Err(io::Error::new(io::ErrorKind::Other, "assembler failed"));
+            return Err(io::Error::other("assembler failed"));
         }
 
         if args.verbose {
@@ -314,7 +314,7 @@ fn process_file(
     let _ = std::fs::remove_file(&temp_asm);
 
     if !status.success() {
-        return Err(io::Error::new(io::ErrorKind::Other, "assembler failed"));
+        return Err(io::Error::other("assembler failed"));
     }
 
     // Link
@@ -325,7 +325,7 @@ fn process_file(
     let _ = std::fs::remove_file(&temp_obj);
 
     if !status.success() {
-        return Err(io::Error::new(io::ErrorKind::Other, "linker failed"));
+        return Err(io::Error::other("linker failed"));
     }
 
     if args.verbose {

cc/main.rs

@@ -711,6 +711,7 @@ pub struct FunctionDef {
 
 /// An external declaration (top-level item)
 #[derive(Debug, Clone)]
+#[allow(clippy::large_enum_variant)]
 pub enum ExternalDecl {
     /// Function definition
     FunctionDef(FunctionDef),

cc/parse/ast.rs

@@ -3564,7 +3564,7 @@ impl Parser<'_> {
         // Build the type from the base type
         let mut result_type_id = base_type_id;
 
-        if inner_type_id.is_some() {
+        if let Some(inner_tid) = inner_type_id {
             // Grouped declarator: int (*p)[3] or void (*fp)(int)
             // Arrays/functions in suffix apply to the base type first
             // Then we substitute into the inner declarator
@@ -3612,7 +3612,7 @@ impl Parser<'_> {
             // -> Pointer(Array(3, int))
             // For void (*fp)(int): inner_decl is Pointer(Void), result_type is Function(void, [int])
             // -> Pointer(Function(void, [int]))
-            result_type_id = self.substitute_base_type(inner_type_id.unwrap(), result_type_id);
+            result_type_id = self.substitute_base_type(inner_tid, result_type_id);
         } else {
             // Simple declarator: char *arr[3]
             // Pointers bind tighter than arrays: *arr[3] = array of pointers

cc/parse/parser.rs

@@ -56,17 +56,6 @@ pub enum SymbolKind {
     Typedef,
 }
 
-// ============================================================================
-// Storage Class
-// ============================================================================
-
-/// Storage class for variables/functions
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub enum StorageClass {
-    #[default]
-    None,
-}
-
 // ============================================================================
 // Symbol
 // ============================================================================