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.

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

Rollup of 9 pull requests #109431

Closed
wants to merge 30 commits into from

Commits on Jan 4, 2023

  1. Configuration menu
    Copy the full SHA
    01d6c04 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. Configuration menu
    Copy the full SHA
    ed63201 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. review nits

    BoxyUwU committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    ee31e5f View commit details
    Browse the repository at this point in the history
  2. add assert

    BoxyUwU committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    ea08d3a View commit details
    Browse the repository at this point in the history
  3. add comments

    Co-authored-by: lcnr <rust@lcnr.de>
    BoxyUwU and lcnr committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    ce14a1e View commit details
    Browse the repository at this point in the history
  4. UNACEPTABLE

    BoxyUwU committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    e06c62c View commit details
    Browse the repository at this point in the history
  5. fix let else unformatting

    BoxyUwU committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    aa8de17 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e624ef4 View commit details
    Browse the repository at this point in the history
  7. fix bad assertion

    BoxyUwU committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    9df35a5 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b85bc19 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. add myself to mailmap

    aDotInTheVoid committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    69a82f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Configuration menu
    Copy the full SHA
    9f80c75 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    239ec6c View commit details
    Browse the repository at this point in the history
  3. fix typo

    lcnr committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    5b4fa5b View commit details
    Browse the repository at this point in the history
  4. Support aggregate expressions

    cbeuw committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    8e4e55e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e24f5ac View commit details
    Browse the repository at this point in the history
  6. Use builtin_index instead of match

    Co-authored-by: Oli Scherer <github35764891676564198441@oli-obk.de>
    cbeuw and oli-obk committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    f404f33 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f321144 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    cbb8066 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5058cc8 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    720cc40 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Rollup merge of rust-lang#106434 - clubby789:document-sum-result, r=t…

    …he8472
    
    Document `Iterator::sum/product` for Option/Result
    
    Closes rust-lang#105266
    
    We already document the similar behavior for `collect()` so I believe it makes sense to add this too. The Option/Result implementations *are* documented on their respective pages and the page for `Sum`, but buried amongst many other trait impls which doesn't make it very discoverable.
    
    ```@rustbot``` label +A-docs
    matthiaskrgr committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    76534b5 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#108842 - compiler-errors:non_lifetime_binde…

    …rs-object-safe, r=b-naber
    
    Enforce non-lifetime-binders in supertrait preds are not object safe
    
    We can't construct vtables for these supertraits.
    matthiaskrgr committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    5f3afc7 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#108896 - BoxyUwU:new_solver_add_goal_fn, r=…

    …lcnr
    
    new solver: make all goal evaluation able to be automatically rerun
    
    It is generally wrong to call `evaluate_goal` multiple times or `evaluate_goal` and `evaluate_all` for the same `QueryResult` without correctly handling rerunning the goals when inference makes progress. Not doing so will result in the assertion in `evaluate_goal` firing because rerunning the goal will lead to a more accurate `QueryResult`.
    
    Currently there are lots of places that get this wrong and generally it is complex and error prone to handle correctly everywhere. This PR introduces a way to add goals to the `EvalCtxt` and then run all the added goals in a loop so that `evaluate_goal`/`evaluate_all` is not necessary to call manually.
    
    There are a few complications for making everything work "right":
    1. the `normalizes-to` hack that replaces the rhs with an unconstrained infer var requires special casing in the new `try_evaluate_added_goals` function similar to how `evaluate_goal`'s assertion special cases that hack.
    
    2. `assemble_candidates_after_normalizing_self_ty`'s normalization step needs to be reran for each candidate otherwise the found candidates will potentially get a more accurate `QueryResult` when rerunning the projection/trait goal which can effect the `QueryResult` of the projection/trait goal.
    This is implemented via `EvalCtxt::probe`'s closure's `EvalCtxt` inheriting the added goals of the `EvalCtxt` that `probe` is called on, allowing us to add goals in a probe, and then enter a nested probe for each candidate and evaluate added goals which include the normalization step's goals.
    
    I made `make_canonical_response` evaluate added goals so that it will be hard to mess up the impl of the solver by forgetting to evaluate added goals. Right now the only way to mess this up would be to call `response_no_constraints` (which from the name is obviously weird).
    
    The visibility of `evaluate_goal` means that it can be called from various `compute_x_goal` or candidate assembly functions, this is generally wrong and we should never call `evaluate_goal` manually, instead we should be calling `add_goal`/`add_goals`. This is solved by moving `evaluate_goal` `evaluate_canonical_goal` and `compute_goal` into `eval_ctxt`'s module and making them private so they cannot be called from elsewhere, forcing people to call `add_goal/s` and `evaluate_added_goals_and_make_canonical_resposne`/`try_evaluate_added_goals`
    
    ---
    
    Other changes:
    - removed the `&& false` that was introduced to the assertion in `evaluate_goal` in rust-lang#108839
    - remove a `!self.did_overflow()` requirement in `search_graph.is_empty()` which causes goals that overflow to ICE
    - made `EvalCtxt::eq` take `&mut self` and add all the nested goals via `add_goals` instead of returning them as 99% of call sites just immediately called `EvalCtxt::add_goals` manually.
    
    r? ```@lcnr```
    matthiaskrgr committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    20d3000 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#109240 - compiler-errors:dont-binder-twice,…

    … r=oli-obk
    
    Walk un-shifted nested `impl Trait` in trait when setting up default trait method assumptions
    
    Fixes a double subtraction in some binder math in return-position `impl Trait` in trait handling code.
    
    Fixes rust-lang#109239
    matthiaskrgr committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    7c4ea5e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5cbee82 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    18d8690 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#109390 - cbeuw:aggregate-lit, r=oli-obk

    Custom MIR: Support aggregate expressions
    
    Add support for tuple, array and ADT expressions in custom mir
    
    r? ``@oli-obk`` or ``@tmiasko`` or ``@JakobDegen``
    matthiaskrgr committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    a9f7860 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#109403 - chenyukang:yukang/fix-109396, r=es…

    …tebank
    
    Avoid ICE of attempt to add with overflow in emitter
    
    Fixes rust-lang#109396
    r? ``@estebank``
    matthiaskrgr committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    0271c1c View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#109408 - RalfJung:retags, r=compiler-errors

    not *all* retags might be explicit in Runtime MIR
    
    In rust-lang#105317 I made Miri treat `Rvalue::Ref/AddrOf` as implicit retagging sites. This updates the MIR docs accordingly.
    
    For `Rvalue::Ref` I think this makes a lot more sense: creating a new reference is their entire point, so we can avoid bloating the MIR with retags. Also this seems to be the best way to handle cases like `*ptr = &[mut] ...`, where doing a retag is somewhat questionable since maybe `*ptr` points to another place now?
    
    For `Rvalue::AddrOf`, Stacked Borrows needs this because even raw ptrs need some retagging, but Tree Borrows doesn't do ant retagging here and I hope we'll end up with a model where raw pointers don't get retagged.
    matthiaskrgr committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    7939ee6 View commit details
    Browse the repository at this point in the history