Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const ALLOWED_CFGS: &[&str] = &[
"libc_ctest",
// Corresponds to `__USE_TIME_BITS64` in UAPI
"linux_time_bits64",
"musl_v1_2_3"
"musl_v1_2_3",
];

// Extra values to allow for check-cfg.
Expand Down
17 changes: 10 additions & 7 deletions ci/style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,9 @@ done < "$tmpfile"

rm "$tmpfile"

if shellcheck --version ; then
# FIXME(ctest): update ctest scripts so we don't need to exclude them
find . -name '*.sh' -not -path './ctest/*' -print0 | xargs -0 shellcheck
else
echo "shellcheck not found"
exit 1
fi
# Run once from workspace root to get everything that wasn't handled as an
# individual file.
cargo fmt

# Ensure that `sort` output is not locale-dependent
export LC_ALL=C
Expand All @@ -88,3 +84,10 @@ for file in libc-test/semver/*.txt; do
exit 1
fi
done

if shellcheck --version ; then
find . -name '*.sh' -print0 | xargs -0 shellcheck
else
echo "shellcheck not found"
exit 1
fi
1 change: 0 additions & 1 deletion ctest-test/tests/all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,3 @@ fn test_invalid_include_path() {

assert!(err.is_err(), "Expected error with invalid include path");
}

7 changes: 4 additions & 3 deletions ctest/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
#![recursion_limit = "256"]
#![deny(missing_docs)]

use anyhow::{anyhow, Context, Result};
use garando_syntax as syntax;
use indoc::writedoc;
use std::collections::{HashMap, HashSet};
use std::env;
use std::fs::File;
use std::io::prelude::*;
use std::io::BufWriter;
use std::path::{Path, PathBuf};
use std::rc::Rc;

use anyhow::{anyhow, Context, Result};
use garando_syntax as syntax;
use indoc::writedoc;
use syntax::abi::Abi;
use syntax::ast;
use syntax::ast::{Attribute, Name};
Expand Down
7 changes: 6 additions & 1 deletion src/windows/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,12 @@ extern "C" {
#[link_name = "_get_timezone"]
pub fn get_timezone(seconds: *mut c_long) -> errno_t;
#[link_name = "_get_tzname"]
pub fn get_tzname(p_return_value: *mut size_t, time_zone_name: *mut c_char, size_in_bytes: size_t, index: c_int) -> errno_t;
pub fn get_tzname(
p_return_value: *mut size_t,
time_zone_name: *mut c_char,
size_in_bytes: size_t,
index: c_int,
) -> errno_t;
#[link_name = "_localtime64_s"]
pub fn localtime_s(tmDest: *mut tm, sourceTime: *const time_t) -> crate::errno_t;
#[link_name = "_time64"]
Expand Down
Loading