Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: avoid timing out in Travis #4773

Merged
merged 3 commits into from
Nov 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ matrix:
allow_failures:
- os: windows
env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
- env: INTEGRATION=rust-lang-nursery/stdsimd

before_script:
- |
Expand Down
5 changes: 3 additions & 2 deletions ci/integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ cd checkout

# run clippy on a project, try to be verbose and trigger as many warnings
# as possible for greater coverage
# NOTE: we use `tee` to print any warnings and errors to stdout
# to avoid build timeout in Travis
RUST_BACKTRACE=full \
cargo clippy \
--all-targets \
Expand All @@ -26,10 +28,9 @@ cargo clippy \
--cap-lints warn \
-W clippy::pedantic \
-W clippy::nursery \
> clippy_output 2>&1 || true
2>&1 | tee clippy_output

cargo uninstall clippy
cat clippy_output

if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then
exit 1
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/mutex_atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Mutex {
}
}

fn get_atomic_name(ty: Ty<'_>) -> Option<(&'static str)> {
fn get_atomic_name(ty: Ty<'_>) -> Option<&'static str> {
match ty.kind {
ty::Bool => Some("AtomicBool"),
ty::Uint(_) => Some("AtomicUsize"),
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ pub fn match_path_ast(path: &ast::Path, segments: &[&str]) -> bool {
}

/// Gets the definition associated to a path.
pub fn path_to_res(cx: &LateContext<'_, '_>, path: &[&str]) -> Option<(def::Res)> {
pub fn path_to_res(cx: &LateContext<'_, '_>, path: &[&str]) -> Option<def::Res> {
let crates = cx.tcx.crates();
let krate = crates
.iter()
Expand Down