summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Oram <dev@mitmaro.ca>2022-01-05 09:16:18 -0330
committerTim Oram <dev@mitmaro.ca>2022-01-05 09:44:16 -0330
commit2e4b9f6312608f5f08c296a3ec51d34f9f962d2f (patch)
tree244ced034aff2d1029a4d87c52ce59f373128810
parenta3b4458fdca527622f17657d9936f80640587643 (diff)
Disable the mod_module_files lint
This project uses mod.rs files, and will continue to do so. Also update the Makefile.toml file to ensure that stable and nightly Rust are updated, to catch these linting issues earlier.
-rw-r--r--Makefile.toml20
-rwxr-xr-xscripts/add-lints.bash1
-rw-r--r--src/config/src/lib.rs1
-rw-r--r--src/core/src/lib.rs1
-rw-r--r--src/display/src/lib.rs1
-rw-r--r--src/git/src/lib.rs1
-rw-r--r--src/input/src/lib.rs1
-rw-r--r--src/main.rs1
-rw-r--r--src/todo_file/src/lib.rs1
-rw-r--r--src/view/src/lib.rs1
10 files changed, 28 insertions, 1 deletions
diff --git a/Makefile.toml b/Makefile.toml
index 017b3c6..32c6345 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -3,12 +3,14 @@ skip_core_tasks = true
default_to_workspace = false
[tasks.build]
+dependencies = ["update-rust-stable"]
toolchain = "stable"
install_crate = false
command = "cargo"
args = ["build", "${@}"]
[tasks.build-release]
+dependencies = ["update-rust-stable"]
toolchain = "stable"
install_crate = false
command = "cargo"
@@ -17,10 +19,11 @@ args = ["build", "--release", "${@}"]
[tasks.build-deb]
toolchain = "stable"
command = "cargo"
-dependencies = ["build-release"]
+dependencies = ["update-rust-stable", "build-release"]
args = ["deb"]
[tasks.clean]
+dependencies = ["update-rust-stable"]
toolchain = "stable"
install_crate = false
command = "cargo"
@@ -52,6 +55,7 @@ dependencies = [
]
[tasks.docs-stable]
+dependencies = ["update-rust-stable"]
toolchain = "stable"
command = "cargo"
args = [
@@ -62,6 +66,7 @@ args = [
]
[tasks.docs-nightly]
+dependencies = ["update-rust-nightly"]
toolchain = "nightly"
ignore_errors = true
command = "cargo"
@@ -79,6 +84,7 @@ dependencies = [
]
[tasks.lint-stable]
+dependencies = ["update-rust-stable"]
toolchain = "stable"
command = "cargo"
args = [
@@ -89,6 +95,7 @@ args = [
]
[tasks.lint-nightly]
+dependencies = ["update-rust-nightly"]
toolchain = "nightly"
ignore_errors = true
command = "cargo"
@@ -100,6 +107,7 @@ args = [
]
[tasks.format]
+dependencies = ["update-rust-nightly"]
toolchain = "nightly"
command = "cargo"
args = [
@@ -111,6 +119,7 @@ args = [
]
[tasks.licenses]
+dependencies = ["update-rust-nightly"]
toolchain = "nightly"
script = ['''
cargo +nightly about generate "docs/licenses.hbs" > "docs/licenses.html"
@@ -123,7 +132,16 @@ command = "scripts/add-lints.bash"
command = "scripts/publish.bash"
[tasks.test]
+dependencies = ["update-rust-stable"]
toolchain = "stable"
install_crate = false
command = "cargo"
args = ["test", "--workspace"]
+
+[tasks.update-rust-stable]
+command = "rustup"
+args = ["update", "stable"]
+
+[tasks.update-rust-nightly]
+command = "rustup"
+args = ["update", "nightly"]
diff --git a/scripts/add-lints.bash b/scripts/add-lints.bash
index 9d91f88..2630506 100755
--- a/scripts/add-lints.bash
+++ b/scripts/add-lints.bash
@@ -72,6 +72,7 @@ content="\
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]
diff --git a/src/config/src/lib.rs b/src/config/src/lib.rs
index e5109fd..86548e7 100644
--- a/src/config/src/lib.rs
+++ b/src/config/src/lib.rs
@@ -53,6 +53,7 @@
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]
diff --git a/src/core/src/lib.rs b/src/core/src/lib.rs
index 438d301..b1820aa 100644
--- a/src/core/src/lib.rs
+++ b/src/core/src/lib.rs
@@ -53,6 +53,7 @@
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]
diff --git a/src/display/src/lib.rs b/src/display/src/lib.rs
index 6133821..dbf900d 100644
--- a/src/display/src/lib.rs
+++ b/src/display/src/lib.rs
@@ -53,6 +53,7 @@
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]
diff --git a/src/git/src/lib.rs b/src/git/src/lib.rs
index 1c56b9c..05ba63f 100644
--- a/src/git/src/lib.rs
+++ b/src/git/src/lib.rs
@@ -53,6 +53,7 @@
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]
diff --git a/src/input/src/lib.rs b/src/input/src/lib.rs
index 763cb71..3df5fe5 100644
--- a/src/input/src/lib.rs
+++ b/src/input/src/lib.rs
@@ -53,6 +53,7 @@
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]
diff --git a/src/main.rs b/src/main.rs
index a5004f1..df95d14 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -53,6 +53,7 @@
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]
diff --git a/src/todo_file/src/lib.rs b/src/todo_file/src/lib.rs
index da82a51..6ee36d8 100644
--- a/src/todo_file/src/lib.rs
+++ b/src/todo_file/src/lib.rs
@@ -53,6 +53,7 @@
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]
diff --git a/src/view/src/lib.rs b/src/view/src/lib.rs
index 701974a..ee5400a 100644
--- a/src/view/src/lib.rs
+++ b/src/view/src/lib.rs
@@ -53,6 +53,7 @@
clippy::expect_used,
clippy::implicit_return,
clippy::missing_docs_in_private_items,
+ clippy::mod_module_files,
clippy::redundant_pub_crate,
clippy::tabs_in_doc_comments
)]