Rollup of 6 pull requests #96388

GuillaumeGomez · 2022-04-25T09:39:07Z

Successful merges:

Add more diagnostic items #96302 (Add more diagnostic items)
Better handle too many # recovery in raw str #96355 (Better handle too many # recovery in raw str)
Switch JS code to ES6 #96361 (Switch JS code to ES6)
Fix running bootstrap tests on a fresh clone #96375 (Fix running bootstrap tests on a fresh clone)
delay bug when adjusting NeverToAny twice during diagnostic code #96379 (delay bug when adjusting NeverToAny twice during diagnostic code)
do not consider two extern types to be similar #96384 (do not consider two extern types to be similar)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Point at all the unnecessary trailing `#`. Better handle interaction with outer attributes when `;` is missing. Fix rust-lang#95030.

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.

…=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.

…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.

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```

…-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.

…-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

…er-errors do not consider two extern types to be similar

GuillaumeGomez · 2022-04-25T09:39:19Z

@bors: r+ p=6 rollup=never

bors · 2022-04-25T09:39:21Z

📌 Commit dcd6fd5 has been approved by GuillaumeGomez

rust-log-analyzer · 2022-04-25T09:52:17Z

The job x86_64-gnu-llvm-12 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


---- [ui] src/test/ui/coercion/coerce-issue-49593-box-never.rs#nofallback stdout ----
diff of stderr:

4 LL |     /* *mut $0 is coerced to Box<dyn Error> here */ Box::<_ /* ! */>::new(x)
5    |                                                     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::error::Error` is not implemented for `()`
-    = help: the following other types implement trait `std::error::Error`:
-              !
-              &'a T
-              AccessError
---
17    = note: required for the cast to the object type `dyn std::error::Error`
18 
19 error[E0277]: the trait bound `(): std::error::Error` is not satisfied

22 LL |     /* *mut $0 is coerced to *mut Error here */ raw_ptr_box::<_ /* ! */>(x)
23    |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::error::Error` is not implemented for `()`
-    = help: the following other types implement trait `std::error::Error`:
-              !
-              &'a T
-              AccessError
---
37 error: aborting due to 2 previous errors


The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coercion/coerce-issue-49593-box-never.nofallback/coerce-issue-49593-box-never.nofallback.stderr
To only update this specific test, also pass `--test-args coercion/coerce-issue-49593-box-never.rs`


error in revision `nofallback`: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/coercion/coerce-issue-49593-box-never.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "nofallback" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coercion/coerce-issue-49593-box-never.nofallback" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coercion/coerce-issue-49593-box-never.nofallback/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0277]: the trait bound `(): std::error::Error` is not satisfied
   |
   |
LL |     /* *mut $0 is coerced to Box<dyn Error> here */ Box::<_ /* ! */>::new(x)
   |                                                     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::error::Error` is not implemented for `()`
   = note: required for the cast to the object type `dyn std::error::Error`

error[E0277]: the trait bound `(): std::error::Error` is not satisfied
  --> /checkout/src/test/ui/coercion/coerce-issue-49593-box-never.rs:22:49
  --> /checkout/src/test/ui/coercion/coerce-issue-49593-box-never.rs:22:49
   |
LL |     /* *mut $0 is coerced to *mut Error here */ raw_ptr_box::<_ /* ! */>(x)
   |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::error::Error` is not implemented for `()`
   = note: required for the cast to the object type `(dyn std::error::Error + 'static)`

error: aborting due to 2 previous errors

GuillaumeGomez · 2022-04-25T09:54:19Z

@bors: r-

Serial-ATA and others added 14 commits April 21, 2022 22:18

Add more diagnostic items

ea013e0

Better handle too many # recovery in raw str

3587406

Point at all the unnecessary trailing `#`. Better handle interaction with outer attributes when `;` is missing. Fix rust-lang#95030.

Update search.js to ES6

4280c81

Update settings.js to ES6

3c95c0b

Update rustdoc-js tester tool to work with new kind of variables

0233abe

Delay bug when adjusting NeverToAny twice during diagnostic

5165295

do not consider two extern types to be similar

5594db0

Rollup merge of rust-lang#96302 - Serial-ATA:more-diagnostic-items, r…

2b0f0eb

…=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.

Rollup merge of rust-lang#96355 - estebank:issue-95030, r=compiler-er…

2557101

…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.

Rollup merge of rust-lang#96361 - GuillaumeGomez:es6, r=notriddle

66760d4

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```

Rollup merge of rust-lang#96384 - lcnr:extern-types-similar, r=compil…

dcd6fd5

…er-errors do not consider two extern types to be similar

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 25, 2022

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 25, 2022

GuillaumeGomez closed this Apr 25, 2022

GuillaumeGomez deleted the rollup-y4h0x8n branch April 25, 2022 09:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #96388

Rollup of 6 pull requests #96388

GuillaumeGomez commented Apr 25, 2022

GuillaumeGomez commented Apr 25, 2022

bors commented Apr 25, 2022

rust-log-analyzer commented Apr 25, 2022

GuillaumeGomez commented Apr 25, 2022

Rollup of 6 pull requests #96388

Rollup of 6 pull requests #96388

Conversation

GuillaumeGomez commented Apr 25, 2022

GuillaumeGomez commented Apr 25, 2022

bors commented Apr 25, 2022

rust-log-analyzer commented Apr 25, 2022

GuillaumeGomez commented Apr 25, 2022