Skip to content
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.

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

Make FsType's raw type public #1187

Merged
merged 1 commit into from Feb 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -9,6 +9,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
where it's available, and clears the environment of all variables
via `std::env::vars` and `std::env::remove_var` on others.
(#[1185](https://github.com/nix-rust/nix/pull/1185))
- `FsType` inner value made public.
(#[1187](https://github.com/nix-rust/nix/pull/1187))
### Changed
### Fixed
### Removed
Expand Down
10 changes: 5 additions & 5 deletions src/sys/statfs.rs
Expand Up @@ -20,19 +20,19 @@ pub struct Statfs(libc::statfs);

#[cfg(target_os = "freebsd")]
#[derive(Eq, Copy, Clone, PartialEq, Debug)]
pub struct FsType(u32);
pub struct FsType(pub u32);
#[cfg(target_os = "android")]
#[derive(Eq, Copy, Clone, PartialEq, Debug)]
pub struct FsType(libc::c_ulong);
pub struct FsType(pub libc::c_ulong);
#[cfg(all(target_os = "linux", target_arch = "s390x"))]
#[derive(Eq, Copy, Clone, PartialEq, Debug)]
pub struct FsType(u32);
pub struct FsType(pub u32);
#[cfg(all(target_os = "linux", target_env = "musl"))]
#[derive(Eq, Copy, Clone, PartialEq, Debug)]
pub struct FsType(libc::c_ulong);
pub struct FsType(pub libc::c_ulong);
#[cfg(all(target_os = "linux", not(any(target_arch = "s390x", target_env = "musl"))))]
#[derive(Eq, Copy, Clone, PartialEq, Debug)]
pub struct FsType(libc::c_long);
pub struct FsType(pub libc::c_long);

#[cfg(all(target_os = "linux", not(target_env = "musl"), not(target_arch = "s390x")))]
pub const ADFS_SUPER_MAGIC: FsType = FsType(libc::ADFS_SUPER_MAGIC);
Expand Down