Skip to content

Rename os_version to os.version #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename os_version to os.version #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/image/descriptor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pub struct Platform {
/// manifests where os.version is not known to work with the host OS
/// version. Valid values are implementation-defined. e.g.
/// 10.0.14393.1066 on windows.
#[serde(skip_serializing_if = "Option::is_none")]
#[serde(rename = "os.version", skip_serializing_if = "Option::is_none")]
#[builder(default)]
os_version: Option<String>,
/// This OPTIONAL property specifies an array of strings, each
Expand Down
2 changes: 2 additions & 0 deletions src/image/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ impl From<&str> for Os {
"aix" => Os::AIX,
"android" => Os::Android,
"darwin" => Os::Darwin,
// std::env::consts::OS returns "macos" instead of darwin
"macos" => Os::Darwin,
Copy link
Copy Markdown
Member

@utam0k utam0k Apr 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May I ask you to create another commit or PR about this change?

Copy link
Copy Markdown
Contributor

@MOZGIII MOZGIII Jan 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's been a long time, I suggest maintainers close this PR and properly commit this fix themselves.

Copy link
Copy Markdown
Contributor

@MOZGIII MOZGIII Jan 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, and this PR is also obsolete, since master already has the title changes.

"dragonfly" => Os::DragonFlyBSD,
"freebsd" => Os::FreeBSD,
"hurd" => Os::Hurd,
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ mod tests {
.expect("failed to canonicalize rootfs");

assert_eq!(
&rootfs_absolute_path,
&rootfs_absolute_path.canonicalize().unwrap(),
spec.root.expect("no root in spec").path()
);
}
Expand All @@ -310,7 +310,7 @@ mod tests {
.expect("failed to canonicalize rootfs");

assert_eq!(
&rootfs_absolute_path,
&rootfs_absolute_path.canonicalize().unwrap(),
spec.root.expect("no root in spec").path()
);
}
Expand Down