Skip to content
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.

Sign up for GitHub

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

Jump to bottom

More restrictive 2 phase borrows - take 2 #58739

Merged
merged 10 commits into from
Apr 7, 2019
Merged

More restrictive 2 phase borrows - take 2 #58739

merged 10 commits into from
Apr 7, 2019

Commits on Apr 4, 2019

  1. Fix cases of conflicting two-phase borrows

    @matthewjasper
    matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    7eda723 View commit details
    Browse the repository at this point in the history

  2. Treat two-phase borrow reservations as mutable accesses

    @matthewjasper
    matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    f8e2beb View commit details
    Browse the repository at this point in the history

  3. Update tests for restrictive two-phase borrows

    @matthewjasper
    matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    c0c3c00 View commit details
    Browse the repository at this point in the history

  4. add mutable_borrow_reservation_conflict future-incompatibility lint. 

    Convert the new 2-phase reservation errors into instances of the lint
so that they will be controlled by that attribute.
    @pnkfelix @matthewjasper
    pnkfelix authored and matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    074f239 View commit details
    Browse the repository at this point in the history

  5. update unit test output to reflect change to lint-based diagnostic.

    @pnkfelix @matthewjasper
    pnkfelix authored and matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    9738d7a View commit details
    Browse the repository at this point in the history

  6. unit test for the lint itself, illustrating that it can be controlled… 

    … by `#[allow(..)]` etc.
    @pnkfelix @matthewjasper
    pnkfelix authored and matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    800be4c View commit details
    Browse the repository at this point in the history

  7. Adjust the mutable_borrow_reservation_conflict message 

    We aren't sure if this will become an error or not yet.
    @matthewjasper
    matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    b3f6266 View commit details
    Browse the repository at this point in the history

  8. Fix out-of-date comment 

    A comment in one match arm make a blanket statement about "reads/reservations", but in fact the whole point of this PR is that reservations are *not* handled by that particular arm anymore.
    @pnkfelix @matthewjasper
    pnkfelix authored and matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    4ff459f View commit details
    Browse the repository at this point in the history

  9. Placate tidy 

    Get us back below 100 characters per line to placate tidy.
    @pnkfelix @matthewjasper
    pnkfelix authored and matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    820b088 View commit details
    Browse the repository at this point in the history

  10. Use more accurate lint root for mutable_borrow_reservation_conflict

    @matthewjasper
    matthewjasper committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    cc5088d View commit details
    Browse the repository at this point in the history