Skip to content

Commit

Permalink
Enable libc extra_traits feature
Browse files Browse the repository at this point in the history
Also bump Rust requirement to 1.25 which is a requirement of that feature
  • Loading branch information
Susurrus committed Jun 4, 2019
1 parent bf5970e commit 32e52f3
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ task:
setup_script:
- pkg install -y curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
- sh rustup.sh -y --default-toolchain 1.24.1
- sh rustup.sh -y --default-toolchain 1.25.0
- $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
amd64_test_script:
- . $HOME/.cargo/env
Expand Down
50 changes: 25 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,63 +22,63 @@ matrix:
# Additionally they're moved to the front of the line to get them in the Travis
# OS X build queue first.
- env: TARGET="aarch64-apple-ios;armv7-apple-ios;armv7s-apple-ios;i386-apple-ios;x86_64-apple-ios" DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0
os: osx

# Mac builds
# These are also moved to be first because they wait in a long queue with Travis
- env: TARGET=i686-apple-darwin
rust: 1.24.1
rust: 1.25.0
os: osx
- env: TARGET=x86_64-apple-darwin
rust: 1.24.1
rust: 1.25.0
os: osx

# Android
- env: TARGET=aarch64-linux-android DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0
- env: TARGET=arm-linux-androideabi DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0
- env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0
- env: TARGET=i686-linux-android DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0

# Linux
- env: TARGET=aarch64-unknown-linux-gnu
rust: 1.24.1
rust: 1.25.0
- env: TARGET=arm-unknown-linux-gnueabi
rust: 1.24.1
rust: 1.25.0
- env: TARGET=arm-unknown-linux-musleabi DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0
- env: TARGET=armv7-unknown-linux-gnueabihf
rust: 1.24.1
rust: 1.25.0
- env: TARGET=i686-unknown-linux-gnu
rust: 1.24.1
rust: 1.25.0
- env: TARGET=i686-unknown-linux-musl
rust: 1.24.1
rust: 1.25.0
- env: TARGET=mips-unknown-linux-gnu
rust: 1.24.1
rust: 1.25.0
- env: TARGET=mips64-unknown-linux-gnuabi64
rust: 1.24.1
rust: 1.25.0
- env: TARGET=mips64el-unknown-linux-gnuabi64
rust: 1.24.1
rust: 1.25.0
- env: TARGET=mipsel-unknown-linux-gnu
rust: 1.24.1
rust: 1.25.0
- env: TARGET=powerpc-unknown-linux-gnu DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0
- env: TARGET=powerpc64-unknown-linux-gnu
rust: 1.24.1
rust: 1.25.0
- env: TARGET=powerpc64le-unknown-linux-gnu
rust: 1.24.1
rust: 1.25.0
- env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0
- env: TARGET=x86_64-unknown-linux-gnu
rust: 1.24.1
rust: 1.25.0
- env: TARGET=x86_64-unknown-linux-musl
rust: 1.24.1
rust: 1.25.0

# *BSD
# FreeBSD i686 and x86_64 use BuildBot instead of Travis
Expand All @@ -87,7 +87,7 @@ matrix:
# - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
# - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
- env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
rust: 1.24.1
rust: 1.25.0

# Make sure stable is always working too
- env: TARGET=x86_64-unknown-linux-gnu
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
```

### Changed
- Minimum supported Rust version is now 1.25.0
([#1035](https://github.com/nix-rust/nix/pull/1035))
### Fixed
### Removed

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exclude = [
]

[dependencies]
libc = "0.2.57"
libc = { git = "https://github.com/rust-lang/libc", features = [ "extra_traits" ] }
bitflags = "1.0"
cfg-if = "0.1.0"
void = "1.0.2"
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ limitations. Support for platforms is split into three tiers:
*do not* block the inclusion of new code. Testing may be run, but
failures in tests don't block the inclusion of new code.

The following targets are all supported by nix on Rust 1.24.1 or newer (unless
otherwise noted):
The following targets are supported by `nix`:

Tier 1:
* aarch64-unknown-linux-gnu
Expand Down Expand Up @@ -84,6 +83,8 @@ Tier 2:

## Usage

`nix` requires Rust 1.25.0 or newer.

To use `nix`, first add this to your `Cargo.toml`:

```toml
Expand Down

0 comments on commit 32e52f3

Please sign in to comment.