Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
senekor committed Sep 9, 2023
1 parent 803d0bd commit 90c6878
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
toolchain: stable

- name: Format
run: ./bin/format_exercises
run: ./bin/format_exercises.sh

- name: Diff
run: |
Expand Down
2 changes: 1 addition & 1 deletion rust-tooling/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust-tooling/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ edition = "2021"
[dependencies]
convert_case = "0.6.0"
glob = "0.3.1"
ignore = "0.4.20"
inquire = "0.6.2"
once_cell = "1.18.0"
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.105"
tera = "1.19.1"
uuid = { version = "1.4.1", features = ["v4"] }
walkdir = "2.3.3"
3 changes: 1 addition & 2 deletions rust-tooling/src/problem_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ pub fn get_canonical_data(slug: &str) -> CanonicalData {
#[test]
fn test_deserialize_canonical_data() {
crate::fs_utils::cd_into_repo_root();
for entry in walkdir::WalkDir::new("problem-specifications/exercises")
.into_iter()
for entry in ignore::Walk::new("problem-specifications/exercises")
.filter_map(|e| e.ok())
.filter(|e| e.file_name().to_str().unwrap() == "canonical-data.json")
{
Expand Down
5 changes: 2 additions & 3 deletions rust-tooling/tests/no_trailing_whitespace.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::path::Path;

use exercism_tooling::fs_utils;
use walkdir::WalkDir;

fn contains_trailing_whitespace(p: &Path) -> bool {
let contents = std::fs::read_to_string(p).unwrap();
Expand All @@ -17,9 +16,9 @@ fn contains_trailing_whitespace(p: &Path) -> bool {
fn test_no_trailing_whitespace() {
fs_utils::cd_into_repo_root();

for entry in WalkDir::new(".") {
for entry in ignore::Walk::new("./") {
let entry = entry.unwrap();
if !entry.file_type().is_file() {
if !entry.file_type().is_some_and(|t| t.is_file()) {
continue;
}
let path = entry.path();
Expand Down

0 comments on commit 90c6878

Please sign in to comment.