Repository navigation
Remove converter hack around std::map::iterator - #523
Merged
Merged
Conversation
nunoplopes
pushed a commit
that referenced
this pull request
Oct 11, 2026
joaotgouveia
pushed a commit
to joaotgouveia/cpp2rust
that referenced
this pull request
Oct 27, 2026
The old code special cased `std::map::iterator` (which is just a sugar
for `std::pair<const K, V>`) to generate `i.first()` and `i.second()`
instead of `i.0` and `i.1`.
This PR removes the hack by saving a pair in `libcc2rs::MapIter` which
can be accessed with `.0` and `.1`. It also fixes a translation bug:
```cpp
for (auto i : m) {
i.second = -1;
assert(i.second == -1);
}
for (const auto &i : m) {
assert(i.second != -1);
}
```
joaotgouveia
pushed a commit
to joaotgouveia/cpp2rust
that referenced
this pull request
Oct 27, 2026
I realized that Cpp2Rust#523 fully works only with the new AST matcher because of const types: string matcher matches strings which is broken for const pointers in general. Until the AST matcher lands I fixed the string matcher.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The old code special cased
std::map::iterator(which is just a sugar forstd::pair<const K, V>) to generatei.first()andi.second()instead ofi.0andi.1.This PR removes the hack by saving a pair in
libcc2rs::MapIterwhich can be accessed with.0and.1. It also fixes a translation bug: