Skip to content

Conversation

@Veykril
Copy link
Member

@Veykril Veykril commented Oct 26, 2020

This is the last blocker for #6287 after this I can update that PR to properly fix things through using SyntaxRewriter.

This PR also shuffles tests around a bit and adds some more.

Ideally this is just a hack until we implement a "proper" diff algorithm that approximates a minimal diff. Maybe something like gumtree?

@matklad
Copy link
Contributor

matklad commented Oct 26, 2020

CI fails?

@Veykril
Copy link
Member Author

Veykril commented Oct 26, 2020

That one range_mapping_out_of_macros test likes to change when diff logic changes 😅 Given it's not actual working correctly // FIXME: this is very wrong, but somewhat tricky to fix.

@matklad
Copy link
Contributor

matklad commented Nov 2, 2020

bors r+

@bors
Copy link
Contributor

bors bot commented Nov 2, 2020

@bors bors bot merged commit 173e45f into rust-lang:master Nov 2, 2020
@Veykril Veykril deleted the diff-insertions branch November 27, 2020 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants