Skip to content

Add cfg illlumos in addition to solaris #49

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
papertigers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add cfg illlumos in addition to solaris #49

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
30 changes: 25 additions & 5 deletions src/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,17 @@ pub mod os {
/// Although the `passwd` struct is common among Unix systems, its actual
/// format can vary. See the definitions in the `base` module to check which
/// fields are actually present.
#[cfg(any(target_os = "linux", target_os = "android", target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "openbsd", target_os = "netbsd", target_os = "solaris"))]
#[cfg(any(
target_os = "linux",
target_os = "android",
target_os = "macos",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos"
))]
pub mod unix {
use std::ffi::{OsStr, OsString};
use std::path::{Path, PathBuf};
Expand Down Expand Up @@ -1012,10 +1022,10 @@ pub mod os {
}
}

#[cfg(any(target_os = "linux", target_os = "android", target_os = "solaris"))]
#[cfg(any(target_os = "linux", target_os = "android", target_os = "solaris", target_os = "illumos"))]
use super::super::User;

#[cfg(any(target_os = "linux", target_os = "android", target_os = "solaris"))]
#[cfg(any(target_os = "linux", target_os = "android", target_os = "solaris", target_os = "illumos"))]
impl UserExt for User {
fn home_dir(&self) -> &Path {
Path::new(&self.extras.home_dir)
Expand Down Expand Up @@ -1176,11 +1186,21 @@ pub mod os {
pub type UserExtras = bsd::UserExtras;

/// Any extra fields on a `User` specific to the current platform.
#[cfg(any(target_os = "linux", target_os = "android", target_os = "solaris"))]
#[cfg(any(target_os = "linux", target_os = "android", target_os = "solaris", target_os = "illumos"))]
pub type UserExtras = unix::UserExtras;

/// Any extra fields on a `Group` specific to the current platform.
#[cfg(any(target_os = "linux", target_os = "android", target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "openbsd", target_os = "netbsd", target_os = "solaris"))]
#[cfg(any(
target_os = "linux",
target_os = "android",
target_os = "macos",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd",
target_os = "netbsd",
target_os = "solaris",
target_os = "illumos"
))]
pub type GroupExtras = unix::GroupExtras;
}

Expand Down