Rollup of 8 pull requests #117309

workingjubilee · 2023-10-28T08:07:40Z

Successful merges:

Remove -Zdep-tasks. #116534 (Remove -Zdep-tasks.)
Make E0277 use short paths #116739 (Make E0277 use short paths)
Create windows/api.rs for safer FFI #116816 (Create windows/api.rs for safer FFI)
When encountering sealed traits, point types that implement it #116945 (When encountering sealed traits, point types that implement it)
Cleanup and improve --check-cfg implementation #117025 (Cleanup and improve --check-cfg implementation)
Parse rustc version at compile time #117256 (Parse rustc version at compile time)
rustc_interface cleanups #117268 (rustc_interface cleanups)
fix failure to detect a too-big-type after adding padding #117277 (fix failure to detect a too-big-type after adding padding)

r? @ghost
@rustbot modify labels: rollup

add note change wording short_ty_string on t

``` error[E0277]: the trait bound `S: d::Hidden` is not satisfied --> $DIR/sealed-trait-local.rs:53:20 | LL | impl c::Sealed for S {} | ^ the trait `d::Hidden` is not implemented for `S` | note: required by a bound in `c::Sealed` --> $DIR/sealed-trait-local.rs:17:23 | LL | pub trait Sealed: self::d::Hidden { | ^^^^^^^^^^^^^^^ required by this bound in `Sealed` = note: `Sealed` is a "sealed trait", because to implement it you also need to implement `c::d::Hidden`, which is not accessible; this is usually done to force you to use one of the provided types that already implement it = help: the following types implement the trait: - c::X - c::Y ``` The last `help` is new.

Co-authored-by: Esteban Kuber <estebank@users.noreply.github.com>

In `test_edition_parsing`, change the `build_session_options_and_crate_config` call to `build_session_options`, because the config isn't used. That leaves a single call site for `build_session_options_and_crate_config`, so just inline and remove it.

Because its order doesn't matter. This is well demonstrated by `to_crate_config`, which creates a `CrateConfig` from an `FxHashSet`.

In `parse_cfg`, we now construct a `FxHashSet<String>` directly instead of constructing a `FxHashSet<Symbol>` and then immediately converting it to a `FxHashSet<String>`(!) (The type names made this behaviour non-obvious. The next commit will make the type names clearer.)

`parse_cfgspecs` and `parse_check_cfg` run very early, before the main interner is running. They each use a short-lived interner and convert all interned symbols to strings in their output data structures. Once the main interner starts up, these data structures get converted into new data structures that are identical except with the strings converted to symbols. All is not obvious from the current code, which is a mess, particularly with inconsistent naming that obscures the parallel string/symbol data structures. This commit clean things up a lot. - The existing `CheckCfg` type is generic, allowing both `CheckCfg<String>` and `CheckCfg<Symbol>` forms. This is really useful, but it defaults to `String`. The commit removes the default so we have to use `CheckCfg<String>` and `CheckCfg<Symbol>` explicitly, which makes things clearer. - Introduces `Cfg`, which is generic over `String` and `Symbol`, similar to `CheckCfg`. - Renames some things. - `parse_cfgspecs` -> `parse_cfg` - `CfgSpecs` -> `Cfg<String>`, plus it's used in more places, rather than the underlying `FxHashSet` type. - `CrateConfig` -> `Cfg<Symbol>`. - `CrateCheckConfig` -> `CheckCfg<Symbol>` - Adds some comments explaining the string-to-symbol conversions. - `to_crate_check_config`, which converts `CheckCfg<String>` to `CheckCfg<Symbol>`, is inlined and removed and combined with the overly-general `CheckCfg::map_data` to produce `CheckCfg::<String>::intern`. - `build_configuration` now does the `Cfg<String>`-to-`Cfg<Symbol>` conversion, so callers don't need to, which removes the need for `to_crate_config`. The diff for two of the fields in `Config` is a good example of the improved clarity: ``` - pub crate_cfg: FxHashSet<(String, Option<String>)>, - pub crate_check_cfg: CheckCfg, + pub crate_cfg: Cfg<String>, + pub crate_check_cfg: CheckCfg<String>, ``` Compare that with the diff for the corresponding fields in `ParseSess`, and the relationship to `Config` is much clearer than before: ``` - pub config: CrateConfig, - pub check_config: CrateCheckConfig, + pub config: Cfg<Symbol>, + pub check_config: CheckCfg<Symbol>, ```

Despite what I claimed in an earlier commit, the ordering does matter to some degree. Using `FxIndexSet` prevents changes to the error message order in `tests/ui/check-cfg/mix.rs`.

Remove -Zdep-tasks. This option is not useful any more, we can use `tracing` and `RUSTC_LOG` to debug the dep-graph.

…ebank Make `E0277` use short paths Fixes rust-lang#116616

Create `windows/api.rs` for safer FFI FFI is inherently unsafe. For memory safety we need to assert that some contract is being upheld on both sides of the FFI, though of course we can only ever check our side. In Rust, `unsafe` blocks are used to assert safety and `// SAFETY` comments describing why it is safe. Currently in sys/windows we have a lot of this unsafety spread all over the place, with variations on the same unsafe patterns repeated. And because of the repitition and frequency, we're a bit lax with the safety comments. This PR aims to fix this and to make FFI safety more auditable by creating an `api` module with the goal of centralising and consolidating this unsafety. It contains thin wrappers around the Windows API that make most functions safe to call or, if that's not possible, then at least safer. Note that its goal is *only* to address safety. It does not stray far from the Windows API and intentionally does not attempt to make higher lever wrappers around, for example, file handles. This is better left to the existing modules. The windows/api.rs file has a top level comment to help future contributors understand the intent of the module and the design decisions made. I chose two functions as a first tentative step towards the above goal: - [`GetLastError`](https://learn.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-getlasterror) is trivially safe. There's no reason to wrap it in an `unsafe` block every time. So I simply created a safe `get_last_error` wrapper. - [`SetFileInformationByHandle`](https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-setfileinformationbyhandle) is more complex. It essentially takes a generic type but over a C API which necessitates some amount of ceremony. Rather than implementing similar unsafe patterns in multiple places, I provide a safe `set_file_information_by_handle` that takes a Rusty generic type and handles converting that to the form required by the C FFI. r? libs

…rochenkov When encountering sealed traits, point types that implement it ``` error[E0277]: the trait bound `S: d::Hidden` is not satisfied --> $DIR/sealed-trait-local.rs:53:20 | LL | impl c::Sealed for S {} | ^ the trait `d::Hidden` is not implemented for `S` | note: required by a bound in `c::Sealed` --> $DIR/sealed-trait-local.rs:17:23 | LL | pub trait Sealed: self::d::Hidden { | ^^^^^^^^^^^^^^^ required by this bound in `Sealed` = note: `Sealed` is a "sealed trait", because to implement it you also need to implement `c::d::Hidden`, which is not accessible; this is usually done to force you to use one of the provided types that already implement it = help: the following types implement the trait: - c::X - c::Y ``` The last `help` is new.

…pl, r=petrochenkov Cleanup and improve `--check-cfg` implementation This PR removes some indentation in the code, as well as preventing some bugs/misusages and fix a nit in the doc. r? ```@petrochenkov``` (maybe)

…-errors Parse rustc version at compile time This PR eliminates a couple awkward codepaths where it was not clear how the compiler should proceed if its own version number is incomprehensible. https://github.com/rust-lang/rust/blob/dab715641e96a61a534587fda9de1128b75b34dc/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs#L385 https://github.com/rust-lang/rust/blob/dab715641e96a61a534587fda9de1128b75b34dc/compiler/rustc_attr/src/builtin.rs#L630 We can guarantee that every compiled rustc comes with a working version number, so the ICE codepaths above shouldn't need to be written.

…-obk `rustc_interface` cleanups Particularly in and around `--cfg` and `--check-cfg` handling. r? `@oli-obk`

…li-obk fix failure to detect a too-big-type after adding padding Fixes rust-lang#117265

workingjubilee · 2023-10-28T08:07:58Z

@bors r+ rollup=never p=8

bors · 2023-10-28T08:08:00Z

📌 Commit 09fd68d has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2023-10-28T09:07:09Z

⌛ Testing commit 09fd68d with merge 615d0f2...

bors · 2023-10-28T11:02:23Z

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 615d0f2 to master...

rust-timer · 2023-10-28T11:04:38Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116534	Remove -Zdep-tasks.	`c609e2675a1fd7611aba51d4237c18acf9e44a80` (link)
#116739	Make `E0277` use short paths	`962c4946e1126b6058ff49db135fe69bb43ef546` (link)
#116816	Create `windows/api.rs` for safer FFI	`bd7b0e1acf6c378565f09e632b8e18c65d51e00b` (link)
#116945	When encountering sealed traits, point types that implement…	`2fabfbc6e20b80e835c5e5fced68a6e541788d9a` (link)
#117025	Cleanup and improve `--check-cfg` implementation	`7450ab4845e49815a86ccd099ced101e41128675` (link)
#117256	Parse rustc version at compile time	`0ba7c449327a1e69476ba60ab97e2691cdd3250f` (link)
#117268	`rustc_interface` cleanups	`e6f6bdaad8cd8e37f3aec0ed385e5ab0d3d5888c` (link)
#117277	fix failure to detect a too-big-type after adding padding	`9fdcd08f6274887f5edfcbe7e904da1849f3b061` (link)

previous master: 17659c71ba

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-28T13:47:47Z

Finished benchmarking commit (615d0f2): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.2%	[3.1%, 3.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.7%	[-3.7%, -3.7%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-7.2%	[-7.2%, -7.2%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 637.324s -> 635.895s (-0.22%)
Artifact size: 304.41 MiB -> 304.43 MiB (0.00%)

cjgillot and others added 26 commits October 8, 2023 12:23

Remove -Zdep-tasks.

e960d0e

Remove useless debugging.

8531ebf

Create windows/api.rs for safer FFI

3733316

make E0277 use short paths

991bf75

add note change wording short_ty_string on t

Remove most indentation in check-cfg impl

828f069

Fix residual (never merged) check-cfg syntax in doc

1ef96a9

Parse rustc version at compile time

b7debe3

Better guard against wrong input with check-cfg any()

84a1a68

fix failure to detect a too-big-type after adding padding

2ef5897

Update type_err_ctxt_ext.rs

a65d99d

Co-authored-by: Esteban Kuber <estebank@users.noreply.github.com>

Remove an unneeded dependency.

98c469c

Fix a comment.

3feec48

Streamline rustc_interface tests.

2142d01

In `test_edition_parsing`, change the `build_session_options_and_crate_config` call to `build_session_options`, because the config isn't used. That leaves a single call site for `build_session_options_and_crate_config`, so just inline and remove it.

Change CrateConfig from FxIndexSet to FxHashSet.

32986d8

Because its order doesn't matter. This is well demonstrated by `to_crate_config`, which creates a `CrateConfig` from an `FxHashSet`.

Change Cfg<T> to an FxIndexSet.

5438004

Despite what I claimed in an earlier commit, the ordering does matter to some degree. Using `FxIndexSet` prevents changes to the error message order in `tests/ui/check-cfg/mix.rs`.

Rollup merge of rust-lang#116534 - cjgillot:no-dep-tasks, r=davidtwco

975d042

Remove -Zdep-tasks. This option is not useful any more, we can use `tracing` and `RUSTC_LOG` to debug the dep-graph.

Rollup merge of rust-lang#116739 - Milo123459:milo/short-paths, r=est…

471e33f

…ebank Make `E0277` use short paths Fixes rust-lang#116616

Rollup merge of rust-lang#117268 - nnethercote:rustc_interface, r=oli…

48a3865

…-obk `rustc_interface` cleanups Particularly in and around `--cfg` and `--check-cfg` handling. r? `@oli-obk`

Rollup merge of rust-lang#117277 - RalfJung:too-big-with-padding, r=o…

09fd68d

…li-obk fix failure to detect a too-big-type after adding padding Fixes rust-lang#117265

rustbot added T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 28, 2023

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 Oct 28, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 28, 2023

bors merged commit 615d0f2 into rust-lang:master Oct 28, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 28, 2023

workingjubilee deleted the rollup-zqb1dun branch October 28, 2023 11:15

This was referenced Oct 28, 2023

Implement fs_native_path #108981

Open

tidy watcher #114209

Open

Move platform modules into sys::pal #117285

Merged

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #117309

Rollup of 8 pull requests #117309

workingjubilee commented Oct 28, 2023

workingjubilee commented Oct 28, 2023

bors commented Oct 28, 2023

bors commented Oct 28, 2023

bors commented Oct 28, 2023

rust-timer commented Oct 28, 2023

rust-timer commented Oct 28, 2023

Rollup of 8 pull requests #117309

Rollup of 8 pull requests #117309

Conversation

workingjubilee commented Oct 28, 2023

workingjubilee commented Oct 28, 2023

bors commented Oct 28, 2023

bors commented Oct 28, 2023

bors commented Oct 28, 2023

rust-timer commented Oct 28, 2023

rust-timer commented Oct 28, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size