Skip to content
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
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ jobs:
name: Build and Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: rust-toolchain
uses: actions-rs/toolchain@v1.0.6
with:
toolchain: stable
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- name: Build
run: cargo build --verbose
- name: Run unit tests
Expand Down
33 changes: 11 additions & 22 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ jobs:
name: Security audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: rust-toolchain
uses: actions-rs/toolchain@v1.0.6
with:
toolchain: stable
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- name: Install security audit
run: cargo install cargo-audit
- name: Run security audit
Expand All @@ -26,45 +23,37 @@ jobs:
name: Check code formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: rust-toolchain
uses: actions-rs/toolchain@v1.0.6
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: rustfmt
- name: Check code formatting
run: cargo fmt --check --all
clippy_check:
name: Clippy check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: rust-toolchain
uses: actions-rs/toolchain@v1.0.6
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: clippy
- name: Clippy
run: cargo clippy --all-targets
run: cargo clippy --all-targets -- -D warnings
linelint:
name: Check that files end with line break
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Linelint
uses: fernandrone/linelint@master
uses: fernandrone/linelint@0.0.6
id: linelint
unused_dependencies:
name: Look for unused dependencies
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: rust-toolchain
uses: actions-rs/toolchain@v1.0.6
with:
toolchain: nightly
override: true
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
- name: Install unused dependency checker
run: cargo install cargo-udeps
- name: Run unused dependency checker
Expand Down
2 changes: 1 addition & 1 deletion src/defaults.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl Defaults {
"Reading contents of file {} --> input amount: {}, input currency: {}, output currencies: [{}]",
config.path().display(),
defaults.amount,
defaults.input_currency.to_string(),
defaults.input_currency,
defaults
.output_currencies
.iter()
Expand Down
2 changes: 1 addition & 1 deletion tests/int_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ fn test_amount_input_validation() {
let si_suffix = "1M";
cmd.args(vec![&si_suffix, "SAT", "BTC"])
.assert()
.stdout(format!("0.01 BTC\n"));
.stdout("0.01 BTC\n".to_string());

// Allow using floating point numbers
let mut cmd = cargo::cargo_bin_cmd!("bitcoinvert");
Expand Down
Loading