Update deps

Cargo.toml

@@ -30,9 +30,9 @@ regex = "1.11.1"
 regex-syntax = "0.8.5"
 serde = { version = "1.0.215", features = ["derive"] }
 smol = "2.0.2"
-toml_edit = "0.22.22"
+toml_edit = "0.23.9"
 futures = "0.3.31"
-annotate-snippets = "0.11.5"
+annotate-snippets = "0.12.10"
 anstream = "0.6.18"
 
 [workspace.lints.clippy]

tests/Cargo.toml

@@ -27,7 +27,7 @@ anstream.workspace = true
 winnow.workspace = true
 
 [dev-dependencies]
-criterion = "0.5.1"
+criterion = "0.8.1"
 iai = "0.1"
 
 [lib]

tests/fail/ambiguous_build_recipe.txt

@@ -1,11 +1,12 @@
 error[R0011]: ambiguous pattern match: /foofoo
+  |
+note: first pattern here
  --> /INPUT:3:7
   |
 3 | build "%foo" {
-  |       ------ note: first pattern here
-4 |     info "<out>"
-5 | }
-6 |
-7 | build "foo%" {
-  |       ------ note: second pattern here
+  |       ------
+note: second pattern here
+ --> /INPUT:7:7
   |
+7 | build "foo%" {
+  |       ------

tests/fail/ambiguous_path_resolution.txt

@@ -1,9 +1,12 @@
 error[E0032]: ambiguous path resolution: /bar exists in the workspace, but also matches a build recipe
  --> /INPUT:6:10
   |
-5 | build "bar" {
-  |       ----- note: matched this build recipe
 6 |     info "<out>"
   |          ^^^^^^^ ambiguous path resolution: /bar exists in the workspace, but also matches a build recipe
   |
+ ::: /INPUT:5:7
+  |
+5 | build "bar" {
+  |       ----- matched this build recipe
+  |
   = help: use `<...:out-dir>` or `<...:workspace>` to disambiguate between paths in the workspace and the output directory

tests/fail/duplicate_config.txt

@@ -1,8 +1,10 @@
 error[E0033]: duplicate config statement
  --> /INPUT:2:1
   |
-1 | config foo = "a"
-  | ---------------- note: previous config statement here
 2 | config foo = "b"
   | ^^^^^^^^^^^^^^^^ duplicate config statement
   |
+ ::: /INPUT:1:1
+  |
+1 | config foo = "a"
+  | ---------------- previous config statement here

tests/fail/include_missing.txt

@@ -3,4 +3,3 @@ error[E0027]: error including '/does-not-exist.werk': file not found
   |
 1 | include "does-not-exist.werk"
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error including '/does-not-exist.werk': file not found
-  |

tests/fail/include_self.txt

@@ -7,5 +7,4 @@ error[E0035]: same file included twice: /included
  ::: /INPUT:1:1
   |
 1 | include "included"
-  | ------------------ note: already included here
-  |
+  | ------------------ already included here

tests/fail/include_twice.txt

@@ -1,8 +1,10 @@
 error[E0035]: same file included twice: /included
  --> /INPUT:2:1
   |
-1 | include "included"
-  | ------------------ note: already included here
 2 | include "included"
   | ^^^^^^^^^^^^^^^^^^ same file included twice: /included
   |
+ ::: /INPUT:1:1
+  |
+1 | include "included"
+  | ------------------ already included here

tests/fail/include_with_default.txt

@@ -4,9 +4,9 @@ error[E0036]: `default` statements are not allowed in included files
 1 | default target="foo"
   | ^^^^^^^^^^^^^^^^^^^^ `default` statements are not allowed in included files
   |
- ::: /INPUT:1:1
+  = help: move `default` statements to the top-level Werkfile
+note: included here
+ --> /INPUT:1:1
   |
 1 | include "included"
-  | ------------------ note: included here
-  |
-  = help: move `default` statements to the top-level Werkfile
+  | ^^^^^^^^^^^^^^^^^^

tests/fail/include_with_error.txt

@@ -1,14 +1,14 @@
 error[P1001]: parse error
- --> /included:1:1
+ --> /included:1:7
   |
 1 | let a=
   | -     ^ expected expression
   | |
-  | info: while parsing `let` statement
+  | while parsing `let` statement
   |
- ::: /INPUT:1:1
+  = help: expressions must start with a value, or an `env`, `glob`, `which`, or `shell` operation
+note: included here
+ --> /INPUT:1:1
   |
 1 | include "included"
-  | ------------------ note: included here
-  |
-  = help: expressions must start with a value, or an `env`, `glob`, `which`, or `shell` operation
+  | ^^^^^^^^^^^^^^^^^^

tests/mock_io.rs

@@ -243,8 +243,11 @@ impl<'a> Test<'a> {
         let ast = match werk_parser::parse_werk(self.source) {
             Ok(ast) => ast,
             Err(err) => {
-                return Err(Error::Eval(EvalError::Parse(DiagnosticFileId(0), err))
-                    .into_diagnostic_error(&*self as _));
+                return Err(Error::Eval(EvalError::Parse(werk_parser::ErrorInFile {
+                    file: DiagnosticFileId(0),
+                    error: err,
+                }))
+                .into_diagnostic_error(&*self as _));
             }
         };
         self.reload_test_pragmas(&ast);
@@ -863,10 +866,9 @@ pub fn touch_fs(fs: &mut MockDir, path: &std::path::Path, now: SystemTime) -> st
                         }
                     } else {
                         match occupied_entry.into_mut() {
-                            MockDirEntry::File(..) => Err(std::io::Error::new(
-                                std::io::ErrorKind::Other,
-                                "touch file below file",
-                            )),
+                            MockDirEntry::File(..) => {
+                                Err(std::io::Error::other("touch file below file"))
+                            }
                             MockDirEntry::Dir(subdir) => touch_fs(subdir, rest, now),
                         }
                     }

werk-cli/Cargo.toml

@@ -12,7 +12,7 @@ path = "main.rs"
 
 [dependencies]
 ahash.workspace = true
-annotate-snippets = "0.11.5"
+annotate-snippets.workspace = true
 anstream.workspace = true
 anstyle-query = "1.1.2"
 anyhow = "1.0.93"
@@ -23,7 +23,7 @@ line-span = "0.1.5"
 num_cpus = "1.16.0"
 owo-colors = "4.1.0"
 parking_lot.workspace = true
-shadow-rs = "1.1.1"
+shadow-rs = "1.4.0"
 smol.workspace = true
 thiserror.workspace = true
 toml_edit.workspace = true
@@ -36,19 +36,22 @@ werk-util.workspace = true
 anstyle = "1.0.10"
 serde.workspace = true
 serde_json = "1.0.137"
-notify-debouncer-full = "0.5.0"
+notify-debouncer-full = "0.6.0"
 ctrlc = { version = "3.4.5", features = ["termination"] }
 futures.workspace = true
 libc = "0.2.169"
 clap_complete = { version = "4.5.44", features = ["unstable-dynamic"] }
 
 [target.'cfg(windows)'.dependencies]
 # Needed to get terminal width.
-windows-sys = { version = "0.59.0", features = [
+windows-sys = { version = "0.61.2", features = [
     "Win32_System_Console",
     "Win32_Foundation",
+    "Win32_Security",
+    "Win32_Storage",
+    "Win32_Storage_FileSystem",
 ] }
 
 
 [build-dependencies]
-shadow-rs = "0.38.0"
+shadow-rs = "1.4.0"

werk-cli/render/ansi.rs

@@ -353,7 +353,6 @@ impl<const LINEAR: bool> Renderer<LINEAR> {
 
     fn warning(&mut self, _task_id: Option<TaskId>, warning: &Warning) {
         // TODO: Dedup warnings based on span and ID.
-        let diagnostic = warning.as_diagnostic();
         // TODO: Get the term width.
         let renderer = annotate_snippets::Renderer::styled();
 
@@ -362,7 +361,7 @@ impl<const LINEAR: bool> Renderer<LINEAR> {
                 out,
                 "{} {}",
                 "[warn]".bright_yellow(),
-                diagnostic.display(&state.source_map, &renderer)
+                renderer.render(&warning.as_diagnostic(&state.source_map))
             )
         });
     }

werk-fs/path.rs

@@ -257,7 +257,7 @@ impl Path {
 
     #[inline]
     #[must_use]
-    pub fn ancestors(&self) -> Ancestors {
+    pub fn ancestors(&self) -> Ancestors<'_> {
         Ancestors { path: Some(self) }
     }
 
@@ -401,7 +401,7 @@ impl Path {
 
     #[inline]
     #[must_use]
-    pub fn components(&self) -> Components {
+    pub fn components(&self) -> Components<'_> {
         Components { path: Some(self) }
     }
 
@@ -433,7 +433,7 @@ impl Path {
     }
 
     #[inline]
-    pub fn normalize(&self) -> Result<Cow<Absolute<Self>>, PathError> {
+    pub fn normalize(&self) -> Result<Cow<'_, Absolute<Self>>, PathError> {
         Normalize::normalize(self).map_err(Into::into)
     }
 }

werk-fs/traits.rs

@@ -88,10 +88,7 @@ impl<'a> Normalize<'a> for &'a std::path::Path {
                 std::path::Component::CurDir => {}
                 std::path::Component::ParentDir => {
                     if !buf.pop() {
-                        return Err(std::io::Error::new(
-                            std::io::ErrorKind::Other,
-                            TooManyParents,
-                        ));
+                        return Err(std::io::Error::other(TooManyParents));
                     }
                 }
                 _ => buf.push(c),