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 #119384

Merged
merged 10 commits into from
Dec 28, 2023
Merged

Rollup of 5 pull requests #119384

merged 10 commits into from
Dec 28, 2023

Commits on Dec 27, 2023

  1. rustdoc-search: count path edits with separate edit limit

    Since the two are counted separately elsewhere, they should get
    their own limits, too. The biggest problem with combining them
    is that paths are loosely checked by not requiring every component
    to match, which means that if they are short and matched loosely,
    they can easily find "drunk typist" matches that make no sense,
    like this old result:
    
        std::collections::btree_map::itermut matching slice::itermut
        maxEditDistance = ("slice::itermut".length) / 3 = 14 / 3 = 4
        editDistance("std", "slice") = 4
        editDistance("itermut", "itermut") = 0
            4 + 0 <= 4 PASS
    
    Of course, `slice::itermut` should not match stuff from btreemap.
    `slice` should not match `std`.
    
    The new result counts them separately:
    
        maxPathEditDistance = "slice".length / 3 = 5 / 3 = 1
        maxEditDistance = "itermut".length / 3 = 7 / 3 = 2
        editDistance("std", "slice") = 4
            4 <= 1 FAIL
    
    Effectively, this makes path queries less "typo-resistant".
    It's not zero, but it means `vec` won't match the `v1` prelude.
    
    Queries without parent paths are unchanged.
    notriddle committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    0ea58e2 View commit details
    Browse the repository at this point in the history
  2. Simplify Parser::ident_or_error

    Avoid a nested `Result<T, PResult<T>>`.
    DaniPopes committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    826269e View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. Update parse_seq doc

    ShE3py committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    44bf2a3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a88c9a6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7d6cd6b View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#119331 - notriddle:notriddle/maxpatheditdis…

    …tance, r=GuillaumeGomez
    
    rustdoc-search: count path edits with separate edit limit
    
    Avoids strange-looking results like this one, where the path component seems to be ignored:
    
    ![image](https://github.com/rust-lang/rust/assets/1593513/f0ef077a-6e09-4d67-a29d-8cabc1495f66)
    
    Since the two are counted separately elsewhere, they should get their own limits, too. The biggest problem with combining them is that paths are loosely checked by not requiring every component to match, which means that if they are short and matched loosely, they can easily find "drunk typist" matches that make no sense, like this old result:
    
        std::collections::btree_map::itermut matching slice::itermut
        maxEditDistance = ("slice::itermut".length) / 3 = 14 / 3 = 4
        editDistance("std", "slice") = 4
        editDistance("itermut", "itermut") = 0
            4 + 0 <= 4 PASS
    
    Of course, `slice::itermut` should not match stuff from btreemap. `slice` should not match `std`.
    
    The new result counts them separately:
    
        maxPathEditDistance = "slice".length / 3 = 5 / 3 = 1
        maxEditDistance = "itermut".length / 3 = 7 / 3 = 2
        editDistance("std", "slice") = 4
            4 <= 1 FAIL
    
    Effectively, this makes path queries less "typo-resistant". It's not zero, but it means `vec` won't match the `v1` prelude.
    
    This commit also adds substring matching to paths. It's stricter than the substring matching in the main part, but loose enough that what I expect to match does.
    
    Queries without parent paths are unchanged.
    matthiaskrgr committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    2f51bad View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#119359 - DaniPopes:ident-or-err, r=compiler…

    …-errors
    
    Simplify Parser::ident_or_error
    
    Avoid a nested `Result<T, PResult<T>>`.
    matthiaskrgr committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    54bcb07 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#119376 - msrd0:regression-test-106630, r=pe…

    …trochenkov
    
    Add regression test for rust-lang#106630
    
    This PR adds a regression test for rust-lang#106630. I was unsure where exactly to place the test or how to test it locally so please let me know if I should change something.
    matthiaskrgr committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    77c23b3 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#119379 - ShE3py:parse-seq-doc, r=compiler-e…

    …rrors
    
    Update `parse_seq` doc
    
    Some doc changes I made while working on an issue.
    matthiaskrgr committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    0b6e8f5 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#119380 - ShE3py:match-never-pat, r=petroche…

    …nkov
    
    Don't suggest writing a bodyless arm if the pattern can never be a never pattern
    
    rust-lang#118527 enabled arms to be bodyless for never patterns ; this PR removes the `,` and `}` suggestions for patterns that could never be never patterns.
    matthiaskrgr committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    e8831b6 View commit details
    Browse the repository at this point in the history