Skip to content
This repository has been archived by the owner on Apr 18, 2022. It is now read-only.

Commit

Permalink
Merge #2468
Browse files Browse the repository at this point in the history
2468: Fix clippy, don't deny warnings r=Blisto91 a=Veetaha


## Description

Fixed the new warnings introduced in 1.46.0 update.
Also had to remove `--deny warnings` as discussed: #2450 (comment)

## PR Checklist

By placing an x in the boxes I certify that I have:

- [ ] Added unit tests for new code added in this PR.
- [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
- [ ] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
- [ ] Updated the content of the book if this PR would make the book outdated.

If this modified or created any rs files:

- [ ] Ran `cargo +stable fmt --all`
- [ ] Ran `cargo clippy --workspace --features "empty"` (may require `cargo clean` before)
- [ ] Ran `cargo build --features "empty"`
- [ ] Ran `cargo test --workspace --features "empty"`


Co-authored-by: Veetaha <veetaha2@gmail.com>
  • Loading branch information
amethyst-bors and Veetaha committed Aug 29, 2020
2 parents ae22417 + aa04d47 commit 68357dc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ on:
- "**"

env:
RUSTFLAGS: --deny warnings -Cdebuginfo=0
RUSTDOCFLAGS: --deny warnings
RUSTFLAGS: -Cdebuginfo=0

CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
Expand Down
2 changes: 1 addition & 1 deletion amethyst_animation/src/systems/sampling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ where
.last()
.cloned()
.map(secs_to_duration)
.unwrap_or(Duration::from_secs(0));
.unwrap_or_else(|| Duration::from_secs(0));
// duration is past last frame of sampling
if current_dur > last_frame {
// Check end conditions
Expand Down

0 comments on commit 68357dc

Please sign in to comment.