summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhongheng Liu <z.liu@outlook.com.gr>2025-01-18 14:14:12 +0200
committerZhongheng Liu <z.liu@outlook.com.gr>2025-01-18 14:14:12 +0200
commit43a25ed66fde3e6d81d7bfff157b066c969862ad (patch)
tree77a5bac2d97b57d81183a71e69672bf934f30572
parentc0acf9524ac27b7df4895b0ae026272c20237d46 (diff)
downloadadvent2024-43a25ed66fde3e6d81d7bfff157b066c969862ad.tar.gz
advent2024-43a25ed66fde3e6d81d7bfff157b066c969862ad.tar.bz2
advent2024-43a25ed66fde3e6d81d7bfff157b066c969862ad.zip
chore: formatting and cleanup
-rw-r--r--.gitignore36
-rw-r--r--devenv.lock26
-rw-r--r--devenv.nix5
-rw-r--r--src/day3.rs10
4 files changed, 50 insertions, 27 deletions
diff --git a/.gitignore b/.gitignore
index c738d6f..8491945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,39 @@ devenv.local.nix
/target
/**/*.input
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
diff --git a/devenv.lock b/devenv.lock
index 8ab1706..4983385 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,10 +3,10 @@
"devenv": {
"locked": {
"dir": "src/modules",
- "lastModified": 1733788855,
+ "lastModified": 1737028622,
"owner": "cachix",
"repo": "devenv",
- "rev": "d59fee8696cd48f69cf79f65992269df9891ba86",
+ "rev": "4e5b00134bf03f16af6b25b80abb38c598cfe239",
"type": "github"
},
"original": {
@@ -66,35 +66,19 @@
"type": "github"
}
},
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1733730953,
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "7109b680d161993918b0a126f38bc39763e5a709",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
+ ]
},
"locked": {
- "lastModified": 1733665616,
+ "lastModified": 1737043064,
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
+ "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
"type": "github"
},
"original": {
diff --git a/devenv.nix b/devenv.nix
index cbfed48..9a48c2e 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -25,10 +25,7 @@
hello
git --version
'';
-
- languages = {
- rust.enable = true;
- };
+ languages.rust.enable = true;
# https://devenv.sh/tasks/
# tasks = {
# "myproj:setup".exec = "mytool build";
diff --git a/src/day3.rs b/src/day3.rs
index c513619..c10a55a 100644
--- a/src/day3.rs
+++ b/src/day3.rs
@@ -1,6 +1,8 @@
use std::fs;
fn check_mul(instruction: &str) -> bool {
- if instruction.find(',').is_none() { return false; }
+ if instruction.find(',').is_none() {
+ return false;
+ }
let (first_part, second_part) = instruction.split_once(',').expect("Expected mul to split");
let first_num = &first_part[4..];
let second_num = &second_part[..second_part.len() - 1];
@@ -32,7 +34,11 @@ pub fn part1(input_file_path: &str) {
let end_index = tmp.find(')').expect("expected a closure");
let trim_str = tmp.split_at(end_index + 1).0;
println!("{}", trim_str);
- total += if check_mul(trim_str) {eval_mul(trim_str)} else {0};
+ total += if check_mul(trim_str) {
+ eval_mul(trim_str)
+ } else {
+ 0
+ };
});
println!("Eval result: {}", total);
}