Skip to content

Commit c59a8c8

Browse files
bors[bot]asomers
andauthored
Merge #1691
1691: [skip ci] edit CHANGELOG formatting prior to 0.24.0 release r=rtzoeller a=asomers Co-authored-by: Alan Somers <[email protected]>
2 parents 4ccc6c6 + 333d03b commit c59a8c8

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.cirrus.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,8 @@ task:
262262
name: Redox x86_64
263263
env:
264264
TARGET: x86_64-unknown-redox
265-
# Redox requires a nightly compiler.
266-
# If stuff breaks, change nightly to the date at
267-
# https://gitlab.redox-os.org/redox-os/redox/-/blob/master/rust-toolchain
268-
TOOLCHAIN: nightly-2021-06-15
265+
# Redox's MSRV policy is unclear. Until they define it, use nightly.
266+
TOOLCHAIN: nightly
269267
setup_script:
270268
- rustup target add $TARGET
271269
- rustup toolchain install $TOOLCHAIN --profile minimal --target $TARGET

CHANGELOG.md

+9-6
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ This project adheres to [Semantic Versioning](https://semver.org/).
66
## [Unreleased] - ReleaseDate
77
### Added
88

9+
- Added fine-grained features flags. Most Nix functionality can now be
10+
conditionally enabled. By default, all features are enabled.
11+
(#[1611](https://github.com/nix-rust/nix/pull/1611))
912
- Added `fexecve` on DragonFly.
1013
(#[1577](https://github.com/nix-rust/nix/pull/1577))
1114
- `sys::uio::IoVec` is now `Send` and `Sync`
1215
(#[1582](https://github.com/nix-rust/nix/pull/1582))
13-
- Added fine-grained features flags. Most Nix functionality can now be
14-
conditionally enabled. By default, all features are enabled.
15-
(#[1611](https://github.com/nix-rust/nix/pull/1611))
1616
- Added `EPOLLEXCLUSIVE` on Android.
1717
(#[1567](https://github.com/nix-rust/nix/pull/1567))
1818
- Added `fdatasync` for FreeBSD, Fuchsia, NetBSD, and OpenBSD.
@@ -21,7 +21,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
2121
(#[1537](https://github.com/nix-rust/nix/pull/1537))
2222
- Added `posix_fallocate` on DragonFly.
2323
(#[1621](https://github.com/nix-rust/nix/pull/1621))
24-
- Added the `SO_TIMESTAMPING` support
24+
- Added `SO_TIMESTAMPING` support
2525
(#[1547](https://github.com/nix-rust/nix/pull/1547))
2626
- Added getter methods to `MqAttr` struct
2727
(#[1619](https://github.com/nix-rust/nix/pull/1619))
@@ -71,6 +71,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
7171
- Removed the the `PATH_MAX` restriction from APIs accepting paths. Paths
7272
will now be allocated on the heap if they are too long. In addition, large
7373
instruction count improvements (~30x) were made to path handling.
74+
(#[1656](https://github.com/nix-rust/nix/pull/1656))
7475
- Changed `getrlimit` and `setrlimit` to use `rlim_t` directly
7576
instead of `Option<rlim_t>`.
7677
(#[1668](https://github.com/nix-rust/nix/pull/1668))
@@ -80,8 +81,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
8081
- Deprecated `IpAddr`, `Ipv4Addr`, and `Ipv6Addr` in favor of their equivalents
8182
from the standard library.
8283
(#[1685](https://github.com/nix-rust/nix/pull/1685))
83-
- `uname` now returns a `Result` instead of blindly assuming the call never fails.
84-
- Getters on the `UtsName` struct now return a `&OsStr` instead of `&str`.
84+
- `uname` now returns a `Result<UtsName>` instead of just a `UtsName` and
85+
ignoring failures from libc. And getters on the `UtsName` struct now return
86+
an `&OsStr` instead of `&str`.
87+
(#[1672](https://github.com/nix-rust/nix/pull/1672))
8588

8689
### Fixed
8790

0 commit comments

Comments
 (0)