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

convert NLL ops to caches #51538

Merged
merged 72 commits into from
Jun 28, 2018
Merged

convert NLL ops to caches #51538

merged 72 commits into from
Jun 28, 2018

Commits on Jun 26, 2018

  1. introduce type_op

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    909b10c View commit details
    Browse the repository at this point in the history

  2. introduce Subtype type_op

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    2b52793 View commit details
    Browse the repository at this point in the history

  3. introduce Eq type-op

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    9b4fe44 View commit details
    Browse the repository at this point in the history

  4. introduce trivial_noop to accommodate micro-optimizations

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    7c62461 View commit details
    Browse the repository at this point in the history

  5. introduce prove_predicates type op

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    214d765 View commit details
    Browse the repository at this point in the history

  6. make normalize take ownership of the thing to be normalized

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    8147d17 View commit details
    Browse the repository at this point in the history

  7. let trivial_noop take ownership of self

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    f998628 View commit details
    Browse the repository at this point in the history

  8. make normalize into an op

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    846cc26 View commit details
    Browse the repository at this point in the history

  9. create InfcxTypeOp that only depend on an infcx 

    We want any add'l context required to be passed through the struct
itself.
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    13e7793 View commit details
    Browse the repository at this point in the history

  10. resolve type vars *before* entering type_must_outlive 

    All recursive calls only use type-vars that should already be
resolved, because they were obtained from `ty`.
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    5829746 View commit details
    Browse the repository at this point in the history

  11. obligations.rs: rustfmt

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    b858ed5 View commit details
    Browse the repository at this point in the history

  12. make TypeOutlives parameterized over a delegate 

    It was only using the `infcx` to "accumulate" constraints anyhow.
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    65ceec7 View commit details
    Browse the repository at this point in the history

  13. extract a enabled helper to remove some ad-hoc conditionals

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    e7a9e7a View commit details
    Browse the repository at this point in the history

  14. make TypeOp implement debug instead of carrying a closure 

    This allows us to avoid some silly clones etc.
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    7a641cb View commit details
    Browse the repository at this point in the history

  15. introduce DropckOutlives type-op

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    252a6df View commit details
    Browse the repository at this point in the history

  16. promote type_op into a mod.rs file

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    dee1886 View commit details
    Browse the repository at this point in the history

  17. remove the TypeOp vs InfcxTypeOp distinction

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    efc84c8 View commit details
    Browse the repository at this point in the history

  18. mk fully_perform_op_and_get_region_constraint_data a TypeOp method

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    6ac8917 View commit details
    Browse the repository at this point in the history

  19. align the type-op outputs with what canonicalized queries give

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    7123427 View commit details
    Browse the repository at this point in the history

  20. promote canonical into a module

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    5e9f8d5 View commit details
    Browse the repository at this point in the history

  21. break canonicalizer into submodules to make it easier to comprehend

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    a1811ce View commit details
    Browse the repository at this point in the history

  22. move make_query_response into method on infcx

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    dfd33f5 View commit details
    Browse the repository at this point in the history

  23. extract a helper for make_query_result that skips canonicalization

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    bebd3ff View commit details
    Browse the repository at this point in the history

  24. extract the handling of region constraints from queries

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    2624c14 View commit details
    Browse the repository at this point in the history

  25. replace LexicalRegionConstraintData with QueryRegionConstraint

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    c8cf710 View commit details
    Browse the repository at this point in the history

  26. improve trivial_case handling

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    7358931 View commit details
    Browse the repository at this point in the history

  27. make one Canonicalize impl for QueryResult 

    This lets us simplify a few type aliases.
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    be27a5a View commit details
    Browse the repository at this point in the history

  28. move Debug bounds onto Lift 

    Just for convenience.
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    21592cd View commit details
    Browse the repository at this point in the history

  29. change to crate privacy instead of pub(super)

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    7cb86ed View commit details
    Browse the repository at this point in the history

  30. extract type-ops into their own submodules

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    3f1961d View commit details
    Browse the repository at this point in the history

  31. make convert so it can apply to a single constraint

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    e72dc79 View commit details
    Browse the repository at this point in the history

  32. rename instantiate_query_result

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    75e3a9c View commit details
    Browse the repository at this point in the history

  33. extract query_result_substitution helper

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    d748dc5 View commit details
    Browse the repository at this point in the history

  34. remove Canonicalization trait, which serves no purpose

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    1d66462 View commit details
    Browse the repository at this point in the history

  35. introduce QueryTypeOp trait and use it for eq

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    3b446b4 View commit details
    Browse the repository at this point in the history

  36. move type_op into rustc

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    2655522 View commit details
    Browse the repository at this point in the history

  37. introduce canonicalize_hr_query_hack 

    As the comment explains, this is needed to prevent subtype from going
awry in higher-ranked cases, due to rust-lang#33684. The proper fix here is
introducing universes (rust-lang#48536).
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    1acffad View commit details
    Browse the repository at this point in the history

  38. make Eq a true query

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    71ce2e7 View commit details
    Browse the repository at this point in the history

  39. make Subtype a true query

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    4beea99 View commit details
    Browse the repository at this point in the history

  40. convert predicates to operate on 1 predicate at a time

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    d613683 View commit details
    Browse the repository at this point in the history

  41. convert prove_predicate into a query

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    de7e941 View commit details
    Browse the repository at this point in the history

  42. introduce Normalizable trait for things directly normalizable

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    2a0b3d6 View commit details
    Browse the repository at this point in the history

  43. transition to Fallible

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    3e32d42 View commit details
    Browse the repository at this point in the history

  44. instantiate closure requirements as query-region-constraints [WIP] 

    Marked as WIP because it invalidates some tests.
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    7c72e77 View commit details
    Browse the repository at this point in the history

  45. WIP fix error messages for propagate_approximated_shorter_to_static_n… 

    …o_bound
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    7bab9f0 View commit details
    Browse the repository at this point in the history

  46. extract more helpers from instantiating query result

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    f24e90e View commit details
    Browse the repository at this point in the history

  47. introduce QueryKey separation

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    977f3fc View commit details
    Browse the repository at this point in the history

  48. convert dropck_outlives type-op to use the query

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    e895f3a View commit details
    Browse the repository at this point in the history

  49. add a streamlined instantiate_query_result method for NLL queries

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    a583269 View commit details
    Browse the repository at this point in the history

  50. convert query-type-op to create query-region-constraint directly

    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    82169b6 View commit details
    Browse the repository at this point in the history

  51. do not re-create the LocationTable for every path 

    🤦
    @nikomatsakis
    nikomatsakis committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    e98d376 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. nit: don't import Debug directly

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    188ad38 View commit details
    Browse the repository at this point in the history

  2. extract out query boilerplate and use for Eq

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    2fd8a31 View commit details
    Browse the repository at this point in the history

  3. use query boilerplate for normalize

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    fa71af4 View commit details
    Browse the repository at this point in the history

  4. use query boilerplate for subtype

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    ac40d73 View commit details
    Browse the repository at this point in the history

  5. use query boilerplate for prove-predicate -- slightly inefficient 

    This requires us to allocate a single entry vector we didn't use to
allocate. I doubt this makes a difference in practice, as this only
occurs for cache misses.
    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    e6c8c63 View commit details
    Browse the repository at this point in the history

  6. use query boiler plate for normalize_projection_ty too

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    66c8839 View commit details
    Browse the repository at this point in the history

  7. merge all the type_op_foo modules into one as they are so trivial

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    d49d522 View commit details
    Browse the repository at this point in the history

  8. fix wrong query description

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    d695512 View commit details
    Browse the repository at this point in the history

  9. rename upcast to cast_to_tcx_lifetime and improve comment

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    59ea17e View commit details
    Browse the repository at this point in the history

  10. remove either dependency we are not using

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    5bfdb97 View commit details
    Browse the repository at this point in the history

  11. improve comment on instantiate NLL query result fn

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    1be4fff View commit details
    Browse the repository at this point in the history

  12. improve comments on dropck_outlives

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    c6a7c6f View commit details
    Browse the repository at this point in the history

  13. pacify the mercilous tidy

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    35a5065 View commit details
    Browse the repository at this point in the history

  14. extend comment to note complications around lifetimes

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    c2f7757 View commit details
    Browse the repository at this point in the history

  15. rename to shrink_to_tcx_lifetime

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    c3f7e02 View commit details
    Browse the repository at this point in the history

  16. move into provide methods

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    b2e899f View commit details
    Browse the repository at this point in the history

  17. pull out ParamEnvAnd and remove QueryKey

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    0a0dae0 View commit details
    Browse the repository at this point in the history

  18. rename prequery to try_fast_path

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    5fd3b26 View commit details
    Browse the repository at this point in the history

  19. update comments

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    f0fdce3 View commit details
    Browse the repository at this point in the history

  20. change the enter_canonical_trait_query method to give a fulfill cx

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    9b1d222 View commit details
    Browse the repository at this point in the history

  21. rustfmt various files

    @nikomatsakis
    nikomatsakis committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    1523de3 View commit details
    Browse the repository at this point in the history