Mercurial > public > mercurial-scm > hg
comparison rust/hg-core/src/dirstate_tree/status.rs @ 52293:644c696b6c18
rust-status: fix a future compilation error
This was the warning by clippy 1.82.0, which explains the change:
```
warning: this function depends on never type fallback being `()`
--> hg-core/src/dirstate_tree/status.rs:397:5
|
397 | / fn traverse_fs_directory_and_dirstate<'ancestor>(
398 | | &self,
399 | | has_ignored_ancestor: &'ancestor HasIgnoredAncestor<'ancestor>,
400 | | dirstate_nodes: ChildNodesRef<'tree, 'on_disk>,
... |
404 | | is_at_repo_root: bool,
405 | | ) -> Result<bool, DirstateV2ParseError> {
| |___________________________________________^
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
= help: specify the types explicitly
note: in edition 2024, the requirement `!: rayon::iter::FromParallelIterator<()>` will fail
--> hg-core/src/dirstate_tree/status.rs:453:28
|
453 | .collect::<Result<_, _>>()?;
| ^^^^^^^^^^^^
= note: `#[warn(dependency_on_unit_never_type_fallback)]` on by default
```
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Tue, 29 Oct 2024 11:41:27 +0100 |
| parents | b55f653a0b34 |
| children |
comparison
equal
deleted
inserted
replaced
| 52292:4361d787e6cf | 52293:644c696b6c18 |
|---|---|
| 448 self.io_error(error, hg_path); | 448 self.io_error(error, hg_path); |
| 449 Ok(()) | 449 Ok(()) |
| 450 } | 450 } |
| 451 } | 451 } |
| 452 }) | 452 }) |
| 453 .collect::<Result<_, _>>()?; | 453 .collect::<Result<(), _>>()?; |
| 454 | 454 |
| 455 // We don’t know, so conservatively say this isn’t the case | 455 // We don’t know, so conservatively say this isn’t the case |
| 456 let children_all_have_dirstate_node_or_are_ignored = false; | 456 let children_all_have_dirstate_node_or_are_ignored = false; |
| 457 | 457 |
| 458 return Ok(children_all_have_dirstate_node_or_are_ignored); | 458 return Ok(children_all_have_dirstate_node_or_are_ignored); |