Remove restrictions from borrowck #14947
Merged
Conversation
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
added 14 commits
June 16, 2014 15:40
Now that all loans restrict mutation, there's no point in checking for intersection with RESTR_MUTATE.
Remove the unused &Restriction parameter of each_in_scope_restriction's op parameter.
Move the `incompatible` helper function from analyze_restrictions_on_use to the file scope and invert its meaning to account for future uses.
Switch to checking BorrowKind values of loans instead of their RestrictionSet values. This was the last code that made a decision based on a RestrictionSet.
The RestrictionSet parameter of the err_borrowed_pointer_too_short constructor isn't actually used, so it can be removed.
Now that RestrictionSet is no longer being used for anything meaningful, it can be removed, along with any other associated functions and RestrictionSet fields of other types.
The Restriction struct now consists of a single Rc<LoanPath> field, so it can be replaced with Rc<LoanPath>.
Add a helper function that generalizes the loan path restriction strategy used by analyze_restrictions_on_use.
It doesn't actually matter if we call mark_variable_as_used_mut when the assignment was invalid, since the variable was still used mutably.
The only caller of check_for_assignment_to_restricted_or_frozen_location isn't checking its return value, so we can remove it and simplify the internal logic of the function.
Currently, check_for_assignment_to_restricted_or_frozen_location bails out early when looking for loaned base paths when it hits an McDeclared or McImmutable extension. With the current type system, this is actually irrelevant, since mutation can only occur given a unique mutable access path, forcing the same requirement on each base path.
The last remaining use of each_in_scope_restriction in check_for_assignment_to_restricted_or_frozen_location is using the pattern captured by each_in_scope_loan_affecting_path, so it can be removed.
Rename check_for_assignment_to_restricted_or_frozen_location to check_for_assignment_to_borrowed_path.
|
Exciting. |
| -> bool { | ||
| //! Iterates through all the in-scope restrictions for the | ||
| //! given `loan_path` | ||
| fn each_in_scope_loan_affecting_path(&self, |
There was a problem hiding this comment.
I wonder how hard it would be to make these into proper iterators. It'd make the code so much nicer.
bors
added a commit
that referenced
this pull request
Jun 17, 2014
…ikomatsakis Now that features like `const` are gone, we can remove the concept of restrictions from borrowck and just track loans and their restricted paths.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 5, 2023
Add enum, reference, array and slice to `render_const_scalar`
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.
Now that features like
constare gone, we can remove the concept of restrictions from borrowck and just track loans and their restricted paths.