Skip to content

Amended IndexConflict to make it sensitive to the possibility that gi… #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2019

Conversation

iancormac84
Copy link
Contributor

…t_index_conflict_iterator returns a NULL pointer for one of the trio of IndexEntries. Also added Reference::find_reference_dwim to make it a little easier to find refs.

…t_index_conflict_iterator returns a NULL pointer for one of the trio of IndexEntries. Also added Reference::find_reference_dwim to make it a little easier to find refs.
@alexcrichton alexcrichton force-pushed the optionize-indexconflict branch from 5cc9e7b to f35dd8f Compare May 16, 2019 21:11
@iancormac84
Copy link
Contributor Author

Are any changes needed to make this ready for merge?

@alexcrichton
Copy link
Member

The changes here look fine to me yeah but it's a breaking API change so I'd prefer that these were batched up (although I'm not certain when the batch would happen)

@alexcrichton alexcrichton merged commit ac56526 into rust-lang:master Jun 3, 2019
@alexcrichton
Copy link
Member

👍

@iancormac84 iancormac84 deleted the optionize-indexconflict branch July 20, 2019 20:10
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.

2 participants