diff --git a/ci/azure.yml b/ci/azure.yml
index 0e00c9a08457c..c0f22848ae78c 100644
--- a/ci/azure.yml
+++ b/ci/azure.yml
@@ -136,26 +136,25 @@ jobs:
         parameters:
           deploy_dir: target/doc
 
-  # FIXME: re-enable these after the next release
-  #- job: SemverLinux
-  #  dependsOn: BuildChannelsLinux
-  #  continueOnError: true
-  #  pool:
-  #    vmImage: ubuntu-18.04
-  #  steps:
-  #    - template: azure-install-rust.yml
-  #    - script: sh ci/semver.sh linux
-  #      displayName: Check breaking changes
+  - job: SemverLinux
+    dependsOn: BuildChannelsLinux
+    continueOnError: true
+    pool:
+      vmImage: ubuntu-18.04
+    steps:
+      - template: azure-install-rust.yml
+      - script: sh ci/semver.sh linux
+        displayName: Check breaking changes
 
-  #- job: SemverOSX
-  #  dependsOn: BuildChannelsOSX
-  #  continueOnError: true
-  #  pool:
-  #    vmImage: macos-10.15
-  #  steps:
-  #    - template: azure-install-rust.yml
-  #    - script: sh ci/semver.sh osx
-  #      displayName: Check breaking changes
+  - job: SemverOSX
+    dependsOn: BuildChannelsOSX
+    continueOnError: true
+    pool:
+      vmImage: macos-10.15
+    steps:
+      - template: azure-install-rust.yml
+      - script: sh ci/semver.sh osx
+        displayName: Check breaking changes
 
   - job: BuildChannelsLinux
     dependsOn: StyleAndDocs
diff --git a/ci/semver.sh b/ci/semver.sh
index 7e6ea663c8aca..1b568439a1fd7 100644
--- a/ci/semver.sh
+++ b/ci/semver.sh
@@ -13,7 +13,10 @@ if ! rustc --version | grep -E "nightly" ; then
     exit 1
 fi
 
-cargo +nightly install semverver
+rustup component add rustc-dev
+
+# FIXME: Use upstream once it gets rustup.
+cargo +nightly install semververfork
 
 TARGETS=
 case "${OS}" in
@@ -73,5 +76,6 @@ for TARGET in $TARGETS; do
         sleep 1
     done
 
-    cargo +nightly semver --api-guidelines --target="${TARGET}"
+    # FIXME: Use upstream once it gets rustup.
+    cargo +nightly semverfork --api-guidelines --target="${TARGET}"
 done
diff --git a/ci/style.sh b/ci/style.sh
index a6a00171019e4..7acd128de2480 100644
--- a/ci/style.sh
+++ b/ci/style.sh
@@ -5,7 +5,7 @@ set -ex
 rustc ci/style.rs && ./style src
 
 if rustup component add rustfmt-preview ; then
-    which rustfmt
+    command -v rustfmt
     rustfmt -V
     cargo fmt --all -- --check
 fi
diff --git a/src/lib.rs b/src/lib.rs
index 0b1496af1d6c0..d5fba02da20ba 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,14 +14,17 @@
 //! [pd]: https://rust-lang.github.io/libc/#platform-specific-documentation
 #![crate_name = "libc"]
 #![crate_type = "rlib"]
-#![cfg_attr(libc_deny_warnings, deny(warnings))]
+// FIXME: Remove this and redundant_semicolon once renamed lint reaches stable.
+#![allow(renamed_and_removed_lints)]
 #![allow(
     bad_style,
     overflowing_literals,
     improper_ctypes,
     unknown_lints,
-    redundant_semicolon
+    redundant_semicolon,
+    redundant_semicolons
 )]
+#![cfg_attr(libc_deny_warnings, deny(warnings))]
 // Attributes needed when building as part of the standard library
 #![cfg_attr(
     feature = "rustc-dep-of-std",