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 CmdlineOwned alias for Cmdline<'static>

Browse Source 
Signed-off-by: John Eckersberg <jeckersb@redhat.com>
This commit is contained in:
John Eckersberg
2025-11-10 09:34:05 -05:00
parent 43061f0c28
commit c1ae4237dc
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,9 @@ use anyhow::Result;
#[derive(Clone, Debug, Default)]
pub struct Cmdline<'a>(Cow<'a, [u8]>);
/// An owned Cmdline. Alias for `Cmdline<'static>`.
pub type CmdlineOwned = Cmdline<'static>;
impl<'a, T: AsRef<[u8]> + ?Sized> From<&'a T> for Cmdline<'a> {
/// Creates a new `Cmdline` from any type that can be referenced as bytes.
///
@@ -27,7 +30,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> From<&'a T> for Cmdline<'a> {
}
}
impl<'a> From<Vec<u8>> for Cmdline<'a> {
impl From<Vec<u8>> for CmdlineOwned {
/// Creates a new `Cmdline` from an owned `Vec<u8>`.
fn from(input: Vec<u8>) -> Self {
Self(Cow::Owned(input))
@@ -85,7 +88,7 @@ impl<'a> Cmdline<'a> {
/// Creates a new empty owned `Cmdline`.
///
/// This is equivalent to `Cmdline::default()` but makes ownership explicit.
pub fn new() -> Cmdline<'static> {
pub fn new() -> CmdlineOwned {
Cmdline::default()
}
@@ -670,8 +673,8 @@ mod tests {
assert_eq!(kargs.iter().next(), None);
assert!(kargs.is_owned());
// Verify we can store it in a 'static context
let _static_kargs: Cmdline<'static> = Cmdline::new();
// Verify we can store it in an owned ('static) context
let _static_kargs: CmdlineOwned = Cmdline::new();
}
#[test]

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

@@ -17,6 +17,9 @@ use anyhow::Result;
#[derive(Clone, Debug, Default)]
pub struct Cmdline<'a>(bytes::Cmdline<'a>);
/// An owned `Cmdline`. Alias for `Cmdline<'static>`.
pub type CmdlineOwned = Cmdline<'static>;
impl<'a, T: AsRef<str> + ?Sized> From<&'a T> for Cmdline<'a> {
/// Creates a new `Cmdline` from any type that can be referenced as `str`.
///
@@ -26,7 +29,7 @@ impl<'a, T: AsRef<str> + ?Sized> From<&'a T> for Cmdline<'a> {
}
}
impl From<String> for Cmdline<'static> {
impl From<String> for CmdlineOwned {
/// Creates a new `Cmdline` from a `String`.
///
/// Takes ownership of input and maintains it for internal owned data.
@@ -72,7 +75,7 @@ impl<'a> Cmdline<'a> {
/// Creates a new empty owned `Cmdline`.
///
/// This is equivalent to `Cmdline::default()` but makes ownership explicit.
pub fn new() -> Cmdline<'static> {
pub fn new() -> CmdlineOwned {
Cmdline::default()
}
@@ -577,8 +580,8 @@ mod tests {
assert_eq!(kargs.iter().next(), None);
assert!(kargs.is_owned());
// Verify we can store it in a 'static context
let _static_kargs: Cmdline<'static> = Cmdline::new();
// Verify we can store it in an owned ('static) context
let _static_kargs: CmdlineOwned = Cmdline::new();
}
#[test]