[newgrp] merge with main

Author: Inkvisto

.cargo/config.toml

@@ -0,0 +1,2 @@
+[env]
+PROJECT_NAME = "posixutils-rs"

Cargo.lock

@@ -31,6 +31,7 @@ members = [
 repository = "https://github.com/rustcoreutils/posixutils-rs"
 license = "MIT"
 edition = "2021"
+rust-version = "1.80.0"
 
 [workspace.dependencies]
 clap = { version = "4", default-features = false, features = ["std", "derive", "help", "usage", "error-context", "cargo"] }

Cargo.toml

@@ -4,9 +4,9 @@ version = "0.2.1"
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
-plib = { path = "../plib" }
 gettext-rs.workspace = true
 clap.workspace = true
 libc.workspace = true
@@ -16,6 +16,9 @@ lazy_static = "1.4"
 lexical = { version = "6.1", features = ["format"] }
 rand = {version = "0.8", default-features = false, features = ["small_rng"] }
 
+[dev-dependencies]
+plib = { path = "../plib" }
+
 [lints]
 workspace = true
 

awk/Cargo.toml

@@ -343,7 +343,8 @@ fn normalize_builtin_function_arguments(
     }
 }
 
-#[derive(Debug, PartialEq, Eq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(PartialEq, Eq)]
 enum ExprKind {
     LValue,
     Number,
@@ -373,7 +374,8 @@ pub enum GlobalName {
 type NameMap = HashMap<String, GlobalName>;
 type LocalMap = HashMap<String, VarId>;
 
-#[derive(Debug, Default)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Default)]
 struct Instructions {
     opcodes: Vec<OpCode>,
     source_locations: Vec<SourceLocation>,
@@ -1702,7 +1704,8 @@ fn location_end(loc: &InputLocation) -> usize {
     }
 }
 
-#[derive(Debug, Clone)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone)]
 pub struct CompilerErrors {
     errors: Vec<PestError>,
 }

awk/src/compiler.rs

@@ -14,21 +14,24 @@ use std::{
 
 use super::AwkValue;
 
-#[derive(Debug, Clone, PartialEq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, PartialEq)]
 pub struct KeyIterator {
     index: usize,
 }
 
 pub type Key = Rc<str>;
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, Copy, PartialEq)]
 pub struct ValueIndex {
     index: usize,
 }
 
 pub type KeyValuePair = (Key, AwkValue);
 
-#[derive(Debug, Clone, PartialEq, Default)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, PartialEq, Default)]
 pub struct Array {
     key_map: HashMap<Key, usize>,
     pairs: Vec<Option<KeyValuePair>>,

awk/src/interpreter/array.rs

@@ -314,7 +314,8 @@ pub fn parse_conversion_specifier_args(iter: &mut Chars) -> Result<(char, Format
     Ok((next, result))
 }
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(PartialEq, Eq, Clone, Copy)]
 pub enum IntegerFormat {
     Decimal,
     Octal,

awk/src/interpreter/format.rs

@@ -286,7 +286,7 @@ impl WritePipes {
             Entry::Vacant(e) => {
                 let command: CString = command.try_into()?;
                 let file = unsafe {
-                    let file = libc::popen(command.as_ptr(), "w\0".as_ptr() as *const i8);
+                    let file = libc::popen(command.as_ptr(), c"w".as_ptr());
                     if file.is_null() {
                         return Err("failed to open pipe".to_string());
                     }
@@ -351,7 +351,7 @@ impl PipeRecordReader {
     pub fn open(command: &str) -> Result<Self, String> {
         let command = CString::new(command).map_err(|e| e.to_string())?;
         let file = unsafe {
-            let file = libc::popen(command.as_ptr(), "r\0".as_ptr() as *const i8);
+            let file = libc::popen(command.as_ptr(), c"r".as_ptr());
             if file.is_null() {
                 return Err("failed to open pipe".to_string());
             }

awk/src/interpreter/io.rs

@@ -675,7 +675,8 @@ fn is_valid_record_index(index: usize) -> Result<(), String> {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, PartialEq)]
 enum AwkValueVariant {
     Number(f64),
     String(AwkString),
@@ -688,14 +689,16 @@ enum AwkValueVariant {
     UninitializedScalar,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, Copy, PartialEq)]
 enum AwkRefType {
     None,
     Field(u16),
     SpecialGlobalVar(SpecialVar),
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, PartialEq)]
 struct AwkValue {
     value: AwkValueVariant,
     ref_type: AwkRefType,
@@ -889,14 +892,16 @@ impl From<Array> for AwkValue {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, PartialEq)]
 struct ArrayIterator {
     array: *mut AwkValue,
     iter_var: *mut AwkValue,
     key_iter: KeyIterator,
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, PartialEq)]
 struct ArrayElementRef {
     array: *mut AwkValue,
     value_index: ValueIndex,

awk/src/interpreter/mod.rs

@@ -10,13 +10,15 @@
 use core::fmt;
 use std::{ffi::CString, ops::Deref, rc::Rc};
 
-#[derive(Debug, Clone, PartialEq)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone, PartialEq)]
 enum AwkStringVariant {
     Owned(String),
     Shared(Rc<str>),
 }
 
-#[derive(Debug, Clone)]
+#[cfg_attr(test, derive(Debug))]
+#[derive(Clone)]
 pub struct AwkString {
     value: AwkStringVariant,
     pub is_numeric: bool,