Skip to content

Commit

Permalink
Run 'cargo fmt'
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron1011 committed Oct 29, 2019
1 parent 476b675 commit ca2d53e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions build.rs
Expand Up @@ -7,7 +7,8 @@ fn main() {
rustc_minor_nightly().expect("Failed to get rustc version");
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 const_extern_fn_cargo_feature = env::var("CARGO_FEATURE_CONST_EXTERN_FN").is_ok();
let const_extern_fn_cargo_feature =
env::var("CARGO_FEATURE_CONST_EXTERN_FN").is_ok();
let libc_ci = env::var("LIBC_CI").is_ok();

if env::var("CARGO_FEATURE_USE_STD").is_ok() {
Expand Down Expand Up @@ -103,7 +104,8 @@ fn rustc_minor_nightly() -> Option<(u32, bool)> {

let minor = pieces.next();
let nightly_raw = otry!(otry!(pieces.next()).split('-').nth(1));
let nightly = nightly_raw.starts_with("dev") || nightly_raw.starts_with("nightly");
let nightly =
nightly_raw.starts_with("dev") || nightly_raw.starts_with("nightly");
let minor = otry!(otry!(minor).parse().ok());

Some((minor, nightly))
Expand Down
2 changes: 1 addition & 1 deletion tests/const_fn.rs
@@ -1,5 +1,5 @@
#![cfg(libc_const_extern_fn)] // If this does not hold, the file is empty

#[cfg(target_os = "linux")]
const _FOO: libc::c_uint = unsafe { libc::CMSG_SPACE(1) };
const _FOO: libc::c_uint = unsafe { libc::CMSG_SPACE(1) };
//^ if CMSG_SPACE is not const, this will fail to compile

0 comments on commit ca2d53e

Please sign in to comment.