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

Closed
wants to merge 14 commits into from

Commits on Apr 22, 2022

  1. Add more diagnostic items

    Serial-ATA committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    ea013e0 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2022

  1. Better handle too many # recovery in raw str

    Point at all the unnecessary trailing `#`.
    Better handle interaction with outer attributes when `;` is missing.
    
    Fix rust-lang#95030.
    estebank committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    3587406 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4280c81 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3c95c0b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0233abe View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. Fix running bootstrap tests on a fresh clone

    In rust-lang#96303, I changed the tests not to manage submodules, with the main
    goal of avoiding a clone for llvm-project. Unfortunately, there are some tests
    which depend on submodules - I didn't notice locally because they were already checked out for me,
    and CI doesn't use submodule handling at all. Fresh clones, however, were impacted:
    ```
    failures:
    
    ---- builder::tests::defaults::doc_default stdout ----
    thread 'main' panicked at 'fs::read_dir(builder.src.join(&relative_path).join("redirects")) failed with No such file or directory (os error 2)', src/bootstrap/doc.rs:232:21
    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
    
    ---- builder::tests::dist::dist_only_cross_host stdout ----
    thread 'main' panicked at 'fs::read_to_string(&toml_file_name) failed with No such file or directory (os error 2)', src/bootstrap/lib.rs:1314:20
    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
    ```
    
    Try and get the best of both worlds by only checking out the submodules actually used in tests.
    jyn514 committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    0079aad View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5165295 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5594db0 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#96302 - Serial-ATA:more-diagnostic-items, r…

    …=Manishearth
    
    Add more diagnostic items
    
    This just adds a handful diagnostic items I noticed were missing.
    
    Would it be worth doing this for all of the remaining types? I'm willing to do it if it'd be helpful.
    GuillaumeGomez authored Apr 25, 2022
    Configuration menu
    Copy the full SHA
    2b0f0eb View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#96355 - estebank:issue-95030, r=compiler-er…

    …rors
    
    Better handle too many `#` recovery in raw str
    
    Point at all the unnecessary trailing `#`.
    Better handle interaction with outer attributes when `;` is missing.
    
    Fix rust-lang#95030.
    GuillaumeGomez authored Apr 25, 2022
    Configuration menu
    Copy the full SHA
    2557101 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#96361 - GuillaumeGomez:es6, r=notriddle

    Switch JS code to ES6
    
    Considering it's already quite big, I'll do the remaining files in another PR.
    
    Part of rust-lang#93058.
    
    r? ```@notriddle```
    GuillaumeGomez authored Apr 25, 2022
    Configuration menu
    Copy the full SHA
    66760d4 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#96375 - jyn514:bootstrap-submodules, r=Mark…

    …-Simulacrum
    
    Fix running bootstrap tests on a fresh clone
    
    In rust-lang#96303, I changed the tests not to manage submodules, with the main
    goal of avoiding a clone for llvm-project. Unfortunately, there are some tests
    which depend on submodules - I didn't notice locally because they were already checked out for me,
    and CI doesn't use submodule handling at all. Fresh clones, however, were impacted:
    ```
    failures:
    
    ---- builder::tests::defaults::doc_default stdout ----
    thread 'main' panicked at 'fs::read_dir(builder.src.join(&relative_path).join("redirects")) failed with No such file or directory (os error 2)', src/bootstrap/doc.rs:232:21
    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
    
    ---- builder::tests::dist::dist_only_cross_host stdout ----
    thread 'main' panicked at 'fs::read_to_string(&toml_file_name) failed with No such file or directory (os error 2)', src/bootstrap/lib.rs:1314:20
    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
    ```
    
    Try and get the best of both worlds by only checking out the submodules actually used in tests.
    GuillaumeGomez authored Apr 25, 2022
    Configuration menu
    Copy the full SHA
    6997b2d View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#96379 - PrestonFrom:issue_96335, r=compiler…

    …-errors
    
    delay bug when adjusting `NeverToAny` twice during diagnostic code
    
    Addresses Issue 96335 (rust-lang#96335) by using `delay_span_bug` instead of an assert and returning an error type from `check_expr_meets_expectation_or_error`.
    
    Fixes rust-lang#96335
    GuillaumeGomez authored Apr 25, 2022
    Configuration menu
    Copy the full SHA
    9d0c1bf View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#96384 - lcnr:extern-types-similar, r=compil…

    …er-errors
    
    do not consider two extern types to be similar
    GuillaumeGomez authored Apr 25, 2022
    Configuration menu
    Copy the full SHA
    dcd6fd5 View commit details
    Browse the repository at this point in the history