Mercurial > hg
changeset 52297: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 | 4361d787e6cf |
children | 645d247d4c75 |
files | rust/hg-core/src/dirstate_tree/status.rs |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree/status.rs Tue Oct 29 11:35:41 2024 +0100 +++ b/rust/hg-core/src/dirstate_tree/status.rs Tue Oct 29 11:41:27 2024 +0100 @@ -450,7 +450,7 @@ } } }) - .collect::<Result<_, _>>()?; + .collect::<Result<(), _>>()?; // We don’t know, so conservatively say this isn’t the case let children_all_have_dirstate_node_or_are_ignored = false;