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 5 pull requests #112609

Merged
merged 12 commits into from
Jun 14, 2023
Merged

Rollup of 5 pull requests #112609

merged 12 commits into from
Jun 14, 2023

Commits on Jun 11, 2023

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

Commits on Jun 13, 2023

  1. rustdoc-search: search never type with !

    This feature extends rustdoc to support the syntax that most users will
    naturally attempt to use to search for diverging functions.
    Part of rust-lang#60485
    
    It's already possible to do this search with `primitive:never`, but
    that's not what the Rust language itself uses, so nobody will try it if
    they aren't told or helped along.
    notriddle committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    db277f5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7b55f08 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3bbc598 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f7330eb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c92342d View commit details
    Browse the repository at this point in the history
  6. Move test

    compiler-errors committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    7ff79cf View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Rollup merge of rust-lang#112197 - compiler-errors:next-solver-erase,…

    … r=lcnr
    
    Erase regions even if normalization fails in writeback (in new solver)
    
    Or else we ICE during writeback on some programs that error
    matthiaskrgr committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6fc50da View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#112495 - bvanjoi:fix-109153, r=petrochenkov

    fix(resolve): update shadowed_glob more precision
    
    - Fixes rust-lang#109153
    - Fixes rust-lang#109962
    
    ## Why does it panic?
    
    We use rust-lang#109153 as an illustration.
    
    The process of `resolve_imports` is:
    
    | Iter | resolve     | resolution of **`(Mod(root), Ident(bar) in type ns)`** |
    | -    | -           | -      |
    | 0 | `use foo::*`   | `binding` -> foo::bar, `shallowed_glob` -> `None` |
    | 1 | `use bar::bar` | `binding` -> foo::bar::bar, `shallowed_glob` -> foo::bar    |
    | 2 | `use bar::*`   | `binding` -> foo::bar::bar, `shallowed_glob` -> foo::bar::bar::bar |
    
    So during `finalize_import`, the `root::bar` in `use bar::bar` had been pointed to `foo::bar::bar::bar`, which is different from the `initial_module` valued of `foo::bar`, therefore, the panic had been triggered.
    
    ## Try to solve it
    
    ~I think rust-lang#109153 should check-pass rather than throw an ambiguous error. Following this idea, there are two ways to solve this problem:~
    
    ~1. Give up the `initial_module` and update `import.imported_module` after each resolution update. However, I think this method may have too much impact.~
    ~2. Do not update the `shadowed_glob` when it is defined.~
    
    ~To be honest, I am not sure if this is the right way to solve this ICE. Perhaps there is a better resolution.~
    
    Edit: we had made the `resolution.shadowed_glob` update more detailed.
    
    r? `@petrochenkov`
    matthiaskrgr committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    98f6e96 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#112520 - chenyukang:yukang-fix-112505, r=fe…

    …e1-dead
    
    Fix the overflow issue for transmute_generic_consts
    
    Fixes rust-lang#112505
    matthiaskrgr committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    269ea4b View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#112571 - notriddle:notriddle/never-search, …

    …r=GuillaumeGomez
    
    rustdoc-search: search never type with `!`
    
    This feature extends rustdoc to support the syntax that most users will naturally attempt to use to search for diverging functions. Part of rust-lang#60485
    
    It's already possible to do this search with `primitive:never`, but that's not what the Rust language itself uses, so nobody will try it if they aren't told or helped along.
    matthiaskrgr committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    e3021b4 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#112581 - TumoiYorozu:fix_url_encoding_of_pe…

    …rcent_sign, r=notriddle
    
    [rustdoc] Fix URL encoding of % sign
    
    Fix rust-lang#112580
    
    The % is encoded as %%, but the correct encoding is %25.
    matthiaskrgr committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    623b1d4 View commit details
    Browse the repository at this point in the history