Rollup of 7 pull requests #120088

matthiaskrgr · 2024-01-18T07:45:56Z

Successful merges:

Detect NulInCStr error earlier. #119172 (Detect NulInCStr error earlier.)
Make tcx optional from StableMIR run macro and extend it to accept closures #119833 (Make tcx optional from StableMIR run macro and extend it to accept closures)
Modify GenericArg and Term structs to use strict provenance rules #119955 (Modify GenericArg and Term structs to use strict provenance rules)
don't store const var origins for known vars #120021 (don't store const var origins for known vars)
Don't create a separate "basename" when naming and opening a MIR dump file #120038 (Don't create a separate "basename" when naming and opening a MIR dump file)
Don't ICE when deducing future output if other errors already occurred #120057 (Don't ICE when deducing future output if other errors already occurred)
Remove spastorino from users_on_vacation #120073 (Remove spastorino from users_on_vacation)

r? @ghost
@rustbot modify labels: rollup

By making it an `EscapeError` instead of a `LitError`. This makes it like the other errors produced when checking string literals contents, e.g. for invalid escape sequences or bare CR chars. NOTE: this means these errors are issued earlier, before expansion, which changes behaviour. It will be possible to move the check back to the later point if desired. If that happens, it's likely that all the string literal contents checks will be delayed together. One nice thing about this: the old approach had some code in `report_lit_error` to calculate the span of the nul char from a range. This code used a hardwired `+2` to account for the `c"` at the start of a C string literal, but this should have changed to a `+3` for raw C string literals to account for the `cr"`, which meant that the caret in `cr"` nul error messages was one short of where it should have been. The new approach doesn't need any of this and avoids the off-by-one error.

Simplify the `run` macro to avoid sometimes unnecessary dependency on `TyCtxt`. Instead, users can use the new internal method `tcx()`. Additionally, extend the macro to accept closures that may capture variables. These are non-backward compatible changes, but they only affect internal APIs which are provided today as helper functions until we have a stable API to start the compiler.

I added `tcx` argument to `internal` to force 'tcx to be the same lifetime as TyCtxt. The only other solution I could think is to change this function to be `unsafe`.

- Move fix to a separate PR

…etrochenkov Detect `NulInCStr` error earlier. By making it an `EscapeError` instead of a `LitError`. This makes it like the other errors produced when checking string literals contents, e.g. for invalid escape sequences or bare CR chars. NOTE: this means these errors are issued earlier, before expansion, which changes behaviour. It will be possible to move the check back to the later point if desired. If that happens, it's likely that all the string literal contents checks will be delayed together. One nice thing about this: the old approach had some code in `report_lit_error` to calculate the span of the nul char from a range. This code used a hardwired `+2` to account for the `c"` at the start of a C string literal, but this should have changed to a `+3` for raw C string literals to account for the `cr"`, which meant that the caret in `cr"` nul error messages was one short of where it should have been. The new approach doesn't need any of this and avoids the off-by-one error. r? ``@fee1-dead``

…li-obk Make tcx optional from StableMIR run macro and extend it to accept closures Change `run` macro to avoid sometimes unnecessary dependency on `TyCtxt`, and introduce `run_with_tcx` to capture use cases where `tcx` is required. Additionally, extend both macros to accept closures that may capture variables. I've also modified the `internal()` method to make it safer, by accepting the type context to force the `'tcx` lifetime to match the context lifetime. These are non-backward compatible changes, but they only affect internal APIs which are provided today as helper functions until we have a stable API to start the compiler.

Modify GenericArg and Term structs to use strict provenance rules This is the first PR to solve issue rust-lang#119217 . In this PR, I have modified the GenericArg struct to use the `NonNull` struct as the pointer instead of `NonZeroUsize`. The change were tested by running `./x test compiler/rustc_middle`. Resolves rust-lang#119217 r? ``@WaffleLapkin``

…rrors don't store const var origins for known vars r? types

Don't create a separate "basename" when naming and opening a MIR dump file These functions were split up by rust-lang#77080, in order to support passing the dump file's “basename” (filename without extension) to the implementation of `-Zdump-mir-spanview`, so that it could be used as a page title. That flag has since been removed (rust-lang#119566), so now there's no particular reason for this code to handle the basename separately from the filename or full path. This PR therefore restores things to (roughly) how they were before rust-lang#77080.

…r=compiler-errors Don't ICE when deducing future output if other errors already occurred The situation can't really happen outside of erroneous code. What was interesting is that it ICEd before emitting any other diagnostics. This was because the other errors were silenced due to cycle_delay_bug cycle errors. r? ``@compiler-errors`` fixes rust-lang#119890

…cations, r=fmease Remove spastorino from users_on_vacation

matthiaskrgr · 2024-01-18T07:46:10Z

@bors r+ rollup=never p=7

bors · 2024-01-18T07:46:13Z

📌 Commit 15066d3 has been approved by matthiaskrgr

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#119172 (Detect `NulInCStr` error earlier.) - rust-lang#119833 (Make tcx optional from StableMIR run macro and extend it to accept closures) - rust-lang#119955 (Modify GenericArg and Term structs to use strict provenance rules) - rust-lang#120021 (don't store const var origins for known vars) - rust-lang#120038 (Don't create a separate "basename" when naming and opening a MIR dump file) - rust-lang#120057 (Don't ICE when deducing future output if other errors already occurred) - rust-lang#120073 (Remove spastorino from users_on_vacation) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-01-18T09:23:53Z

⌛ Testing commit 15066d3 with merge 6b1dad9...

bors · 2024-01-18T09:31:05Z

💔 Test failed - checks-actions

rust-log-analyzer · 2024-01-18T09:31:36Z

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

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

   Compiling rustc_parse v0.0.0 (/checkout/compiler/rustc_parse)
error: unused import: `DynSync`
  --> compiler/rustc_middle/src/ty/generic_args.rs:10:44
   |
10 | use rustc_data_structures::sync::{DynSend, DynSync};
   |
   = note: `-D unused-imports` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(unused_imports)]`


error: unused import: `DynSend`
  --> compiler/rustc_middle/src/ty/mod.rs:40:35
   |
40 | use rustc_data_structures::sync::{DynSend, DynSync};

error: unused import: `DynSync`
  --> compiler/rustc_middle/src/ty/mod.rs:40:44
   |
   |
40 | use rustc_data_structures::sync::{DynSend, DynSync};

error: unused import: `DynSend`
  --> compiler/rustc_middle/src/ty/generic_args.rs:10:35
   |
   |
10 | use rustc_data_structures::sync::{DynSend, DynSync};

[RUSTC-TIMING] aho_corasick test:false 7.821
   Compiling regex v1.8.4
[RUSTC-TIMING] regex_syntax test:false 9.675

nnethercote and others added 17 commits January 12, 2024 16:19

don't store const var origins for known vars

290651b

Remove tcx function and make internal fn safer

2564811

I added `tcx` argument to `internal` to force 'tcx to be the same lifetime as TyCtxt. The only other solution I could think is to change this function to be `unsafe`.

Inline create_dump_file_with_basename

b82d1d3

Inline dump_file_basename into dump_path

1ec567b

Don't ICE when deducing future output if other errors already occurred

f1ef930

Remove spastorino from users_on_vacation

eb8c1f8

Modify GenericArg and Term structs to use strict provenance rules

dcc13b2

Revert changes to internal method for now

6a573cb

- Move fix to a separate PR

Rollup merge of rust-lang#120021 - lcnr:const-var-value, r=compiler-e…

38b1872

…rrors don't store const var origins for known vars r? types

Rollup merge of rust-lang#120073 - spastorino:remove-spastorino-on-va…

15066d3

…cations, r=fmease Remove spastorino from users_on_vacation

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 18, 2024

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 18, 2024

matthiaskrgr mentioned this pull request Jan 18, 2024

Modify GenericArg and Term structs to use strict provenance rules #119955

Merged

matthiaskrgr closed this Jan 18, 2024

matthiaskrgr deleted the rollup-4eak9yf branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #120088

Rollup of 7 pull requests #120088

matthiaskrgr commented Jan 18, 2024

matthiaskrgr commented Jan 18, 2024

bors commented Jan 18, 2024

bors commented Jan 18, 2024

bors commented Jan 18, 2024

rust-log-analyzer commented Jan 18, 2024

Rollup of 7 pull requests #120088

Rollup of 7 pull requests #120088

Conversation

matthiaskrgr commented Jan 18, 2024

matthiaskrgr commented Jan 18, 2024

bors commented Jan 18, 2024

bors commented Jan 18, 2024

bors commented Jan 18, 2024

rust-log-analyzer commented Jan 18, 2024