Skip to content

Commit 7477c68

Browse files
authored
Merge pull request #1667 from JohnTitor/reenable-semver
Re-enable semver check
2 parents af9101f + 2c73dd9 commit 7477c68

File tree

4 files changed

+30
-24
lines changed

4 files changed

+30
-24
lines changed

ci/azure.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -136,26 +136,25 @@ jobs:
136136
parameters:
137137
deploy_dir: target/doc
138138

139-
# FIXME: re-enable these after the next release
140-
#- job: SemverLinux
141-
# dependsOn: BuildChannelsLinux
142-
# continueOnError: true
143-
# pool:
144-
# vmImage: ubuntu-18.04
145-
# steps:
146-
# - template: azure-install-rust.yml
147-
# - script: sh ci/semver.sh linux
148-
# displayName: Check breaking changes
139+
- job: SemverLinux
140+
dependsOn: BuildChannelsLinux
141+
continueOnError: true
142+
pool:
143+
vmImage: ubuntu-18.04
144+
steps:
145+
- template: azure-install-rust.yml
146+
- script: sh ci/semver.sh linux
147+
displayName: Check breaking changes
149148

150-
#- job: SemverOSX
151-
# dependsOn: BuildChannelsOSX
152-
# continueOnError: true
153-
# pool:
154-
# vmImage: macos-10.15
155-
# steps:
156-
# - template: azure-install-rust.yml
157-
# - script: sh ci/semver.sh osx
158-
# displayName: Check breaking changes
149+
- job: SemverOSX
150+
dependsOn: BuildChannelsOSX
151+
continueOnError: true
152+
pool:
153+
vmImage: macos-10.15
154+
steps:
155+
- template: azure-install-rust.yml
156+
- script: sh ci/semver.sh osx
157+
displayName: Check breaking changes
159158

160159
- job: BuildChannelsLinux
161160
dependsOn: StyleAndDocs

ci/semver.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ if ! rustc --version | grep -E "nightly" ; then
1313
exit 1
1414
fi
1515

16-
cargo +nightly install semverver
16+
rustup component add rustc-dev
17+
18+
# FIXME: Use upstream once it gets rustup.
19+
cargo +nightly install semververfork
1720

1821
TARGETS=
1922
case "${OS}" in
@@ -73,5 +76,6 @@ for TARGET in $TARGETS; do
7376
sleep 1
7477
done
7578

76-
cargo +nightly semver --api-guidelines --target="${TARGET}"
79+
# FIXME: Use upstream once it gets rustup.
80+
cargo +nightly semverfork --api-guidelines --target="${TARGET}"
7781
done

ci/style.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -ex
55
rustc ci/style.rs && ./style src
66

77
if rustup component add rustfmt-preview ; then
8-
which rustfmt
8+
command -v rustfmt
99
rustfmt -V
1010
cargo fmt --all -- --check
1111
fi

src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@
1414
//! [pd]: https://rust-lang.github.io/libc/#platform-specific-documentation
1515
#![crate_name = "libc"]
1616
#![crate_type = "rlib"]
17-
#![cfg_attr(libc_deny_warnings, deny(warnings))]
17+
// FIXME: Remove this and redundant_semicolon once renamed lint reaches stable.
18+
#![allow(renamed_and_removed_lints)]
1819
#![allow(
1920
bad_style,
2021
overflowing_literals,
2122
improper_ctypes,
2223
unknown_lints,
23-
redundant_semicolon
24+
redundant_semicolon,
25+
redundant_semicolons
2426
)]
27+
#![cfg_attr(libc_deny_warnings, deny(warnings))]
2528
// Attributes needed when building as part of the standard library
2629
#![cfg_attr(
2730
feature = "rustc-dep-of-std",

0 commit comments

Comments
 (0)