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

generalize impl trait to permit multiple lifetime bounds #61775

Merged
merged 68 commits into from
Jul 3, 2019
Merged

generalize impl trait to permit multiple lifetime bounds #61775

merged 68 commits into from
Jul 3, 2019

Commits on Jul 2, 2019

  1. opaque_types/mod.rs: rustfmt

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    aab48c9 View commit details
    Browse the repository at this point in the history

  2. introduce constrain_regions helper

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    2eb3fcc View commit details
    Browse the repository at this point in the history

  3. introduce an "in" constraint instead of error

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    14e23a5 View commit details
    Browse the repository at this point in the history

  4. lexical_region_resolve: rustfmt

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    979f566 View commit details
    Browse the repository at this point in the history

  5. make dup_vec optional

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    dfcd1c6 View commit details
    Browse the repository at this point in the history

  6. add some tests, currently ICE-ing

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    c36205b View commit details
    Browse the repository at this point in the history

  7. rename from "in constraint" to "pick constraint"

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    02609b8 View commit details
    Browse the repository at this point in the history

  8. integrate pick constraints into lexical solver more completely

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    f0eebcd View commit details
    Browse the repository at this point in the history

  9. enforce and report pick-constraint errors 

    The error message here is not great.
    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    d6ec0ae View commit details
    Browse the repository at this point in the history

  10. rename QueryRegionConstraint to QueryOutlivesConstraint

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    fd5f767 View commit details
    Browse the repository at this point in the history

  11. introduce QueryRegionConstraints struct (no-op)

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    7e66a96 View commit details
    Browse the repository at this point in the history

  12. introduce QueryRegionConstraints struct

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    09bba9b View commit details
    Browse the repository at this point in the history

  13. rename ConstraintIndex to OutlivesConstraintIndex

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    f673b24 View commit details
    Browse the repository at this point in the history

  14. remove deref impl and add an index impl 

    The constraint set is going to be more than just a set of outlives
constraints.
    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    ec560e2 View commit details
    Browse the repository at this point in the history

  15. pass a &mut QueryRegionConstraints not just outlives constraints

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    f933e09 View commit details
    Browse the repository at this point in the history

  16. propagate the pick-constraints through queries

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    ddc63ce View commit details
    Browse the repository at this point in the history

  17. rename ConstraintSet to OutlivesConstraintSet

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    6ead1c8 View commit details
    Browse the repository at this point in the history

  18. [WIP] fix Lift impl for Rc

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    3aad20d View commit details
    Browse the repository at this point in the history

  19. pass more than outlives constraints to constraint conversion

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    330cb76 View commit details
    Browse the repository at this point in the history

  20. implement PickConstraintSet type

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    d959669 View commit details
    Browse the repository at this point in the history

  21. construct pick-constraints and give them to region inference

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    3b5a727 View commit details
    Browse the repository at this point in the history

  22. preliminary integration of "pick constraints" into nll solver

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    ec48b4e View commit details
    Browse the repository at this point in the history

  23. remove old error and add an explanation

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    cc581bf View commit details
    Browse the repository at this point in the history

  24. improve tests with migration mode, mir mode

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    07ee532 View commit details
    Browse the repository at this point in the history

  25. implement the graph traits for SCC

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    4e85665 View commit details
    Browse the repository at this point in the history

  26. introduce a VecGraph abstraction that cheaply stores graphs 

    This is perhaps better than the linked list approach I was using
before. Lower memory overhead, Theta(N+E) storage. Does require a
sort. =)
    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    4c91bb9 View commit details
    Browse the repository at this point in the history

  27. add a depth_first_search helper function

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    7fd0db7 View commit details
    Browse the repository at this point in the history

  28. integrate reverse graph and upper-bound computation

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    8d39bdd View commit details
    Browse the repository at this point in the history

  29. fix tests and remove outdated stderr files

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    b5fb906 View commit details
    Browse the repository at this point in the history

  30. update the async-fn-multiple-lifetimes test

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    2057136 View commit details
    Browse the repository at this point in the history

  31. add a FIXME related to the non-free-region case 

    I don't think it would actually be harmful to just ignore such cases
but I'm inclined not to take chances.
    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    4de9960 View commit details
    Browse the repository at this point in the history

  32. explain why pick-constraints can be an empty vector

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    2ea6094 View commit details
    Browse the repository at this point in the history

  33. remove outdated TODO markers 

    These were left behind to remind me to cleanup the code -- but the
relevant cleanups were already done.
    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    4831146 View commit details
    Browse the repository at this point in the history

  34. pacify the mercilous tidy 

    long lines, trailing newlines
    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    a18c779 View commit details
    Browse the repository at this point in the history

  35. add a preliminary existential test; not really enough

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    b170c0f View commit details
    Browse the repository at this point in the history

  36. test with explicit existential type

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    e9de08a View commit details
    Browse the repository at this point in the history

  37. add a VecMap data structure

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    89a205b View commit details
    Browse the repository at this point in the history

  38. just create a binary search slice helper fn

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    3e01c74 View commit details
    Browse the repository at this point in the history

  39. account for the pick-constraint edges when reporting errors 

    Also, thread through better span info to improve the error message to
something tolerable.
    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    0b15a66 View commit details
    Browse the repository at this point in the history

  40. address nits by mattewjasper

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    adba6a8 View commit details
    Browse the repository at this point in the history

  41. bless test output

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    5d44beb View commit details
    Browse the repository at this point in the history

  42. fix silly bugs in binary_search_util test

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    fb2c997 View commit details
    Browse the repository at this point in the history

  43. switch to Lrc

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    e6b6873 View commit details
    Browse the repository at this point in the history

  44. implement Lift for Arc

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    e39f66a View commit details
    Browse the repository at this point in the history

  45. rename to "member constraints"

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    eca55b5 View commit details
    Browse the repository at this point in the history

  46. rename pick_constraints.rs to member_constraints.rs

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    134fc4a View commit details
    Browse the repository at this point in the history

  47. implement TypeFoldable for Arc

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    cbc75c6 View commit details
    Browse the repository at this point in the history

  48. feature-gate member constraints outside of async-await 

    Minimizes risk.
    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    74a6efb View commit details
    Browse the repository at this point in the history

  49. Update src/doc/unstable-book/src/language-features/member-constraints.md 

    Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
    @nikomatsakis @Centril
    nikomatsakis and Centril committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    cf721c5 View commit details
    Browse the repository at this point in the history

  50. Update src/librustc/infer/lexical_region_resolve/mod.rs 

    Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
    @nikomatsakis @Centril
    nikomatsakis and Centril committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    56ae0bf View commit details
    Browse the repository at this point in the history

  51. explain why the code is the way it is

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    d2772e8 View commit details
    Browse the repository at this point in the history

  52. various centril nits

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    b4a3753 View commit details
    Browse the repository at this point in the history

  53. rewrite dup_vec to use IndexVec instead of u32

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    9588f7f View commit details
    Browse the repository at this point in the history

  54. cleanup formatting of comment and add attribution

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    6cab003 View commit details
    Browse the repository at this point in the history

  55. opaque_types: various nits

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    6234aed View commit details
    Browse the repository at this point in the history

  56. s/abstract_type_generics/opaque_type_generics/

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    0c8ebea View commit details
    Browse the repository at this point in the history

  57. opaque_types: more nits

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    3ba1e19 View commit details
    Browse the repository at this point in the history

  58. region_constraints: nits

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    d9f4d2a View commit details
    Browse the repository at this point in the history

  59. more centril nits

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    0dd074e View commit details
    Browse the repository at this point in the history

  60. pass a parameter to enable impl Trait instead of a vec

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    9217909 View commit details
    Browse the repository at this point in the history

  61. more nits + typos

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    076b0d0 View commit details
    Browse the repository at this point in the history

  62. introduce more tests covering async fn surface

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    5bd423a View commit details
    Browse the repository at this point in the history

  63. Update src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-one.rs 

    Co-Authored-By: matthewjasper <mjjasper1@gmail.com>
    @nikomatsakis @matthewjasper
    nikomatsakis and matthewjasper committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    8f9a3af View commit details
    Browse the repository at this point in the history

  64. Update src/test/ui/async-await/multiple-lifetimes/fn-ptr.rs 

    Co-Authored-By: matthewjasper <mjjasper1@gmail.com>
    @nikomatsakis @matthewjasper
    nikomatsakis and matthewjasper committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    1d93e3c View commit details
    Browse the repository at this point in the history

  65. Update src/test/ui/async-await/multiple-lifetimes/elided.rs 

    Co-Authored-By: matthewjasper <mjjasper1@gmail.com>
    @nikomatsakis @matthewjasper
    nikomatsakis and matthewjasper committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    f130e9a View commit details
    Browse the repository at this point in the history

  66. Update src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-no-f… 

    …g.rs

Co-Authored-By: matthewjasper <mjjasper1@gmail.com>
    @nikomatsakis @matthewjasper
    nikomatsakis and matthewjasper committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    7f319a7 View commit details
    Browse the repository at this point in the history

  67. address nits

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    0c2c241 View commit details
    Browse the repository at this point in the history

  68. fix ICE with delay-span-bug

    @nikomatsakis
    nikomatsakis committed Jul 2, 2019
    Configuration menu
    Copy the full SHA
    f7e00a5 View commit details
    Browse the repository at this point in the history