Skip to content
Snippets Groups Projects
Commit 4bd0c000 authored by bors's avatar bors
Browse files

Auto merge of #1475 - gnzlbg:fix_build, r=gnzlbg

Remove unnecessary trailing semi-colon
parents dab1050e 3241ec58
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,6 @@ fn main() { ...@@ -7,7 +7,6 @@ fn main() {
rustc_minor_version().expect("Failed to get rustc version"); rustc_minor_version().expect("Failed to get rustc version");
let rustc_dep_of_std = env::var("CARGO_FEATURE_RUSTC_DEP_OF_STD").is_ok(); let rustc_dep_of_std = env::var("CARGO_FEATURE_RUSTC_DEP_OF_STD").is_ok();
let align_cargo_feature = env::var("CARGO_FEATURE_ALIGN").is_ok(); let align_cargo_feature = env::var("CARGO_FEATURE_ALIGN").is_ok();
#[allow(unused)]
let libc_ci = env::var("LIBC_CI").is_ok(); let libc_ci = env::var("LIBC_CI").is_ok();
if env::var("CARGO_FEATURE_USE_STD").is_ok() { if env::var("CARGO_FEATURE_USE_STD").is_ok() {
...@@ -28,6 +27,11 @@ fn main() { ...@@ -28,6 +27,11 @@ fn main() {
Some(_) | None => println!("cargo:rustc-cfg=freebsd11"), Some(_) | None => println!("cargo:rustc-cfg=freebsd11"),
} }
// On CI: deny all warnings
if libc_ci {
println!("cargo:rustc-cfg=libc_deny_warnings");
}
// Rust >= 1.15 supports private module use: // Rust >= 1.15 supports private module use:
if rustc_minor_ver >= 15 || rustc_dep_of_std { if rustc_minor_ver >= 15 || rustc_dep_of_std {
println!("cargo:rustc-cfg=libc_priv_mod_use"); println!("cargo:rustc-cfg=libc_priv_mod_use");
......
...@@ -136,7 +136,7 @@ jobs: ...@@ -136,7 +136,7 @@ jobs:
- template: azure-install-rust.yml - template: azure-install-rust.yml
- script: sh ci/style.sh - script: sh ci/style.sh
displayName: Check style displayName: Check style
- script: sh ci/dox.sh - script: LIBC_CI=1 sh ci/dox.sh
displayName: Generate documentation displayName: Generate documentation
- template: azure-configs/static-websites.yml@rustinfra - template: azure-configs/static-websites.yml@rustinfra
parameters: parameters:
...@@ -169,7 +169,7 @@ jobs: ...@@ -169,7 +169,7 @@ jobs:
vmImage: ubuntu-16.04 vmImage: ubuntu-16.04
steps: steps:
- template: azure-install-rust.yml - template: azure-install-rust.yml
- script: sh ./ci/build.sh - script: LIBC_CI=1 sh ./ci/build.sh
displayName: Execute build.sh displayName: Execute build.sh
strategy: strategy:
matrix: matrix:
...@@ -198,7 +198,7 @@ jobs: ...@@ -198,7 +198,7 @@ jobs:
vmImage: macos-10.13 vmImage: macos-10.13
steps: steps:
- template: azure-install-rust.yml - template: azure-install-rust.yml
- script: sh ./ci/build.sh - script: LIBC_CI=1 sh ./ci/build.sh
displayName: Execute build.sh displayName: Execute build.sh
strategy: strategy:
matrix: matrix:
......
...@@ -14,8 +14,10 @@ ...@@ -14,8 +14,10 @@
//! [pd]: https://rust-lang.github.io/libc/#platform-specific-documentation //! [pd]: https://rust-lang.github.io/libc/#platform-specific-documentation
#![crate_name = "libc"] #![crate_name = "libc"]
#![crate_type = "rlib"] #![crate_type = "rlib"]
#![cfg_attr(not(feature = "rustc-dep-of-std"), deny(warnings))] #![cfg_attr(libc_deny_warnings, deny(warnings))]
#![allow(bad_style, overflowing_literals, improper_ctypes, unknown_lints)] #![allow(bad_style, overflowing_literals, improper_ctypes, unknown_lints)]
// FIXME: this is due to a rustc bug
#![allow(redundant_semicolon)]
// Attributes needed when building as part of the standard library // Attributes needed when building as part of the standard library
#![cfg_attr( #![cfg_attr(
feature = "rustc-dep-of-std", feature = "rustc-dep-of-std",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment