diff options
| author | Irene Knapp <ireneista@irenes.space> | 2025-05-04 01:32:33 -0700 |
|---|---|---|
| committer | Irene Knapp <ireneista@irenes.space> | 2025-05-04 01:32:33 -0700 |
| commit | 3516cb3fa5f475f98246f48601eda31bfa11cc52 (patch) | |
| tree | bd030cf568c27b3c774421bea34cfbd8a8a82312 | |
| parent | 44c3362bcb565aa81f6e3fe0ab7a106dc89f4ba9 (diff) | |
fix build; fix test; update nixpkgs and crane
Force-Push: yes Change-Id: Id2c8a43629f7da16fa8539df95c6e0f583d5c565
| -rw-r--r-- | flake.lock | 19 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | src/main.rs | 2 | ||||
| -rw-r--r-- | src/tests.rs | 2 |
4 files changed, 10 insertions, 16 deletions
diff --git a/flake.lock b/flake.lock index 6a40606..4620a9f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,17 +1,12 @@ { "nodes": { "crane": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1716745752, - "narHash": "sha256-8K1R9Yg4r08rYk86Yq+lu3E9L3uRUb4xMqYHgl0VGS0=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "19ca94ec2d288de334ae932107816b4a97736cd8", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -22,16 +17,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1746183838, + "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "bf3287dac860542719fe7554e21e686108716879", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 60b1308..4c75004 100644 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,10 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-23.11"; + ref = "nixos-24.11"; }; crane = { - inputs.nixpkgs.follows = "nixpkgs"; url = "github:ipetkov/crane"; }; }; diff --git a/src/main.rs b/src/main.rs index 5c183b4..2dd5278 100644 --- a/src/main.rs +++ b/src/main.rs @@ -426,7 +426,7 @@ fn make_command_character_readtable() -> ReadTable { return Err(err_msg("Size to roll must be zero or more.".into())); } - let mut top_item = state.stack.pop().ok_or_else(|| err_msg( + let top_item = state.stack.pop().ok_or_else(|| err_msg( "Data underflow!".into()))?; let mut other_items = Vec::new(); diff --git a/src/tests.rs b/src/tests.rs index 166567f..7438530 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -53,7 +53,7 @@ mod tests { #[test] fn test_registers() -> Result<(), Exit> { let mut state = new_state(); - eval("[1+]s[inc]", &mut state)?; + eval("[1+]v[inc]", &mut state)?; assert_eq!(state.registers["inc"], Value::Str("1+".into())); eval("1(inc)(inc)", &mut state)?; assert_eq!(state.stack[0], Value::Num(dec!(3))); |