containers/bootc
1
0
Fork 0
mirror of https://github.com/containers/bootc.git synced 2026-02-05 15:45:53 +01:00
Code Issues Activity

kernel_cmdline: add_or_modify and remove should take borrowed input

Browse Source 
There's no reason these need to be owned.

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
This commit is contained in:
John Eckersberg
2025-09-12 14:21:26 -04:00
parent 1cf09f39df
commit 78b677bded
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/kernel_cmdline/src/bytes.rs
View File

@@ -138,7 +138,7 @@ impl<'a> Cmdline<'a> {
///
/// Returns `false` if the parameter already existed with the same
/// content.
pub fn add_or_modify(&mut self, param: Parameter) -> bool {
pub fn add_or_modify(&mut self, param: &Parameter) -> bool {
let mut new_params = Vec::new();
let mut modified = false;
let mut seen_key = false;
@@ -148,7 +148,7 @@ impl<'a> Cmdline<'a> {
if !seen_key {
// This is the first time we've seen this key.
// We will replace it with the new parameter.
if p != param {
if p != *param {
modified = true;
}
new_params.push(param.parameter);
@@ -184,12 +184,12 @@ impl<'a> Cmdline<'a> {
/// Remove parameter(s) with the given key from the command line
///
/// Returns `true` if parameter(s) were removed.
pub fn remove(&mut self, key: ParameterKey) -> bool {
pub fn remove(&mut self, key: &ParameterKey) -> bool {
let mut removed = false;
let mut new_params = Vec::new();
for p in self.iter() {
if p.key == key {
if p.key == *key {
removed = true;
} else {
new_params.push(p.parameter);
@@ -633,14 +633,14 @@ mod tests {
let mut kargs = Cmdline::from(b"foo=bar");
// add new
assert!(kargs.add_or_modify(param("baz")));
assert!(kargs.add_or_modify(&param("baz")));
let mut iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo=bar")));
assert_eq!(iter.next(), Some(param("baz")));
assert_eq!(iter.next(), None);
// modify existing
assert!(kargs.add_or_modify(param("foo=fuz")));
assert!(kargs.add_or_modify(&param("foo=fuz")));
iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo=fuz")));
assert_eq!(iter.next(), Some(param("baz")));
@@ -648,7 +648,7 @@ mod tests {
// already exists with same value returns false and doesn't
// modify anything
assert!(!kargs.add_or_modify(param("foo=fuz")));
assert!(!kargs.add_or_modify(&param("foo=fuz")));
iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo=fuz")));
assert_eq!(iter.next(), Some(param("baz")));
@@ -658,14 +658,14 @@ mod tests {
#[test]
fn test_add_or_modify_empty_cmdline() {
let mut kargs = Cmdline::from(b"");
assert!(kargs.add_or_modify(param("foo")));
assert!(kargs.add_or_modify(&param("foo")));
assert_eq!(kargs.0, b"foo".as_slice());
}
#[test]
fn test_add_or_modify_duplicate_parameters() {
let mut kargs = Cmdline::from(b"a=1 a=2");
assert!(kargs.add_or_modify(param("a=3")));
assert!(kargs.add_or_modify(&param("a=3")));
let mut iter = kargs.iter();
assert_eq!(iter.next(), Some(param("a=3")));
assert_eq!(iter.next(), None);
@@ -676,14 +676,14 @@ mod tests {
let mut kargs = Cmdline::from(b"foo bar baz");
// remove existing
assert!(kargs.remove("bar".into()));
assert!(kargs.remove(&"bar".into()));
let mut iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo")));
assert_eq!(iter.next(), Some(param("baz")));
assert_eq!(iter.next(), None);
// doesn't exist? returns false and doesn't modify anything
assert!(!kargs.remove("missing".into()));
assert!(!kargs.remove(&"missing".into()));
iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo")));
assert_eq!(iter.next(), Some(param("baz")));
@@ -693,7 +693,7 @@ mod tests {
#[test]
fn test_remove_duplicates() {
let mut kargs = Cmdline::from(b"a=1 b=2 a=3");
assert!(kargs.remove("a".into()));
assert!(kargs.remove(&"a".into()));
let mut iter = kargs.iter();
assert_eq!(iter.next(), Some(param("b=2")));
assert_eq!(iter.next(), None);

24
crates/kernel_cmdline/src/utf8.rs
View File

@@ -115,15 +115,15 @@ impl<'a> Cmdline<'a> {
///
/// Returns `false` if the parameter already existed with the same
/// content.
pub fn add_or_modify(&mut self, param: Parameter) -> bool {
self.0.add_or_modify(param.0)
pub fn add_or_modify(&mut self, param: &Parameter) -> bool {
self.0.add_or_modify(&param.0)
}
/// Remove parameter(s) with the given key from the command line
///
/// Returns `true` if parameter(s) were removed.
pub fn remove(&mut self, key: ParameterKey) -> bool {
self.0.remove(key.0)
pub fn remove(&mut self, key: &ParameterKey) -> bool {
self.0.remove(&key.0)
}
}
@@ -563,14 +563,14 @@ mod tests {
let mut kargs = Cmdline::from("foo=bar");
// add new
assert!(kargs.add_or_modify(param("baz")));
assert!(kargs.add_or_modify(&param("baz")));
let mut iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo=bar")));
assert_eq!(iter.next(), Some(param("baz")));
assert_eq!(iter.next(), None);
// modify existing
assert!(kargs.add_or_modify(param("foo=fuz")));
assert!(kargs.add_or_modify(&param("foo=fuz")));
iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo=fuz")));
assert_eq!(iter.next(), Some(param("baz")));
@@ -578,7 +578,7 @@ mod tests {
// already exists with same value returns false and doesn't
// modify anything
assert!(!kargs.add_or_modify(param("foo=fuz")));
assert!(!kargs.add_or_modify(&param("foo=fuz")));
iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo=fuz")));
assert_eq!(iter.next(), Some(param("baz")));
@@ -588,14 +588,14 @@ mod tests {
#[test]
fn test_add_or_modify_empty_cmdline() {
let mut kargs = Cmdline::from("");
assert!(kargs.add_or_modify(param("foo")));
assert!(kargs.add_or_modify(&param("foo")));
assert_eq!(kargs.as_ref(), "foo");
}
#[test]
fn test_add_or_modify_duplicate_parameters() {
let mut kargs = Cmdline::from("a=1 a=2");
assert!(kargs.add_or_modify(param("a=3")));
assert!(kargs.add_or_modify(&param("a=3")));
let mut iter = kargs.iter();
assert_eq!(iter.next(), Some(param("a=3")));
assert_eq!(iter.next(), None);
@@ -606,14 +606,14 @@ mod tests {
let mut kargs = Cmdline::from("foo bar baz");
// remove existing
assert!(kargs.remove("bar".into()));
assert!(kargs.remove(&"bar".into()));
let mut iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo")));
assert_eq!(iter.next(), Some(param("baz")));
assert_eq!(iter.next(), None);
// doesn't exist? returns false and doesn't modify anything
assert!(!kargs.remove("missing".into()));
assert!(!kargs.remove(&"missing".into()));
iter = kargs.iter();
assert_eq!(iter.next(), Some(param("foo")));
assert_eq!(iter.next(), Some(param("baz")));
@@ -623,7 +623,7 @@ mod tests {
#[test]
fn test_remove_duplicates() {
let mut kargs = Cmdline::from("a=1 b=2 a=3");
assert!(kargs.remove("a".into()));
assert!(kargs.remove(&"a".into()));
let mut iter = kargs.iter();
assert_eq!(iter.next(), Some(param("b=2")));
assert_eq!(iter.next(), None);