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 6 pull requests #91233

Closed
wants to merge 16 commits into from

Commits on Nov 24, 2021

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

Commits on Nov 25, 2021

  1. Configuration menu
    Copy the full SHA
    f6c728f View commit details
    Browse the repository at this point in the history
  2. Improve tests

    GuillaumeGomez committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    e340478 View commit details
    Browse the repository at this point in the history
  3. Visit param_env field in Obligation's TypeFoldable impl

    This oversight appears to have gone unnoticed for a long time
    without causing issues, but it should still be fixed.
    Aaron1011 committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    d7e8212 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c981d40 View commit details
    Browse the repository at this point in the history
  5. Fix issue 91206

    compiler-errors committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    718a3b1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    69d1917 View commit details
    Browse the repository at this point in the history
  7. On type mismatch caused by assignment, point at assignee

    * Do not emit unnecessary E0308 after E0070
    * Show fewer errors on `while let` missing `let`
    * Hide redundant E0308 on `while let` missing `let`
    * Point at binding definition when possible on invalid assignment
    * do not point at closure twice
    * do not suggest `if let` for literals in lhs
    * account for parameter types
    estebank committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    37a11a9 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9cce7bb View commit details
    Browse the repository at this point in the history
  9. Fix clippy test

    estebank committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    2e1792a View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#85102 - estebank:point-at-assignment, r=oli…

    …-obk
    
    Diagnostic tweaks
    
    * On type mismatch caused by assignment, point at the source of the expectation
    * Hide redundant errors
    * Suggest `while let` when `let` is missing in some cases
    matthiaskrgr authored Nov 25, 2021
    Configuration menu
    Copy the full SHA
    fe80679 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#91169 - RDambrosio016:master, r=bjorn3

    Change cg_ssa's get_param to borrow the builder mutably
    
    This is a small change to make `get_param` more flexible for codegens that may need to modify things when retrieving function parameters.
    
    This will currently only be used by [rustc_codegen_nvvm](https://github.com/Rust-GPU/Rust-CUDA) (my own project), but may be useful to more codegens in the future.
    
    This is needed because cg_nvvm needs to remap certain types to libnvvm-friendly types, such as `i128` -> `<2 x i64>`. Because cg_ssa does not give mutable access to the builder, i resorted to using a mutex:
    ```rs
        fn get_param(&self, index: usize) -> Self::Value {
            let val = llvm::get_param(self.llfn(), index as c_uint);
            trace!("Get param `{:?}`", val);
            unsafe {
                let llfnty = LLVMRustGetFunctionType(self.llfn());
                let map = self.remapped_integer_args.borrow();
                if let Some((_, key)) = map.get(llfnty) {
                    if let Some((_, new_ty)) = key.iter().find(|t| t.0 == index) {
                        trace!("Casting irregular param {:?} to {:?}", val, new_ty);
                        return transmute_llval(
                            *self.llbuilder.lock().unwrap(),
                            &self.cx,
                            val,
                            *new_ty,
                        );
                    }
                }
                val
            }
        }
    ```
    However, i predict this is pretty bad for performance, considering how much builders are called during codegen, so i would greatly appreciate having a more flexible API for this.
    matthiaskrgr authored Nov 25, 2021
    Configuration menu
    Copy the full SHA
    d9992d3 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#91181 - GuillaumeGomez:improve-rustdoc-gui-…

    …ci, r=jsha
    
    Improve rustdoc-gui CI
    
    As commented [here](rust-lang#91179 (comment)):
    
    When the text isn't displayed, the color returned by puppeteer is always `rgba(0,0,0,0)`, which is definitely not the right value. To prevent this error from happening again, `browser-ui-test` will now fail if a CSS color check is run when the text isn't displayed.
    
    Either this PR or rust-lang#91179 is merged first, they'll conflict because I made changes to the same test file.
    
    cc ``@jyn514``
    r? ``@jsha``
    matthiaskrgr authored Nov 25, 2021
    Configuration menu
    Copy the full SHA
    e7b80e8 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#91205 - Aaron1011:visit_param_env, r=lcnr

    Visit `param_env` field in Obligation's `TypeFoldable` impl
    
    This oversight appears to have gone unnoticed for a long time
    without causing issues, but it should still be fixed.
    matthiaskrgr authored Nov 25, 2021
    Configuration menu
    Copy the full SHA
    bb5bcc9 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#91212 - compiler-errors:issue91206, r=oli-obk

    Fix ICE due to out-of-bounds statement index when reporting borrowck error
    
    Replace an `[index]` with a `.get` when `statement_index` points to a basic-block terminator (and is therefore out-of-bounds in the statements list).
    
    Fixes rust-lang#91206
    Cc ``@camsteffen``
    r? ``@oli-obk``
    matthiaskrgr authored Nov 25, 2021
    Configuration menu
    Copy the full SHA
    7fa0291 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#91225 - GuillaumeGomez:source-page-scrollba…

    …r, r=jsha
    
    Fix invalid scrollbar display on source code page
    
    Fixes bug introduced in rust-lang#90983:
    
    ![Screenshot from 2021-11-25 17-01-08](https://user-images.githubusercontent.com/3050060/143473753-c2e7c43c-ce3f-474d-9d2a-922e63189c51.png)
    ![Screenshot from 2021-11-25 17-07-08](https://user-images.githubusercontent.com/3050060/143473757-eecaaf2b-f4f0-49e0-a159-ab485e3f7122.png)
    
    To fix it, I simply unset the `overflow-y` on the source code page so it's not displayed anymore.
    
    r? ``@jsha``
    matthiaskrgr authored Nov 25, 2021
    Configuration menu
    Copy the full SHA
    c57f766 View commit details
    Browse the repository at this point in the history