Rollup of 8 pull requests #100701

matthiaskrgr · 2022-08-17T21:35:11Z

Successful merges:

avoid assertion failures in try_to_scalar_int #99966 (avoid assertion failures in try_to_scalar_int)
Improving Fuchsia rustc support documentation #100637 (Improving Fuchsia rustc support documentation)
Point at a type parameter shadowing another type #100643 (Point at a type parameter shadowing another type)
Migrations for rustc_expand transcribe.rs #100651 (Migrations for rustc_expand transcribe.rs)
Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_recovery #100670 (Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_recovery)
tidy: check fluent files for style #100671 (tidy: check fluent files for style)
Migrate lint reports in typeck::check_unused to LintDiagnostic #100674 (Migrate lint reports in typeck::check_unused to LintDiagnostic)
update Miri #100682 (update Miri)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Improving wording

…recovery Something seems to have gotten out of sync during the creation of rust-lang#81177, where both the argument and comment were introduced.

Co-authored-by: David Wood <agile.lion3441@fuligin.ink>

… fixed slug name

avoid assertion failures in try_to_scalar_int Given that this is called `try_to_scalar_int`, we probably shouldn't `assert_int` here. Similarly `try_to_bits` also doesn't `assert!` that the size is correct. Also add some `track_caller` for debugging, while we are at it. r? `@oli-obk`

…ents, r=tmandry Improving Fuchsia rustc support documentation * Adjusting `package/meta/package` to fit current schema * Adding repository server step * Adjusting step to give default repository * Adding "recreate" step for easier step following

…adowing-another-type, r=estebank Point at a type parameter shadowing another type This patch fixes a part of rust-lang#97459.

…nd_transcribe, r=davidtwco Migrations for rustc_expand transcribe.rs This PR includes some migrations to the new diagnostics API for the `rustc_expand` module. r? `@davidtwco`

…docs, r=davidtwco Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_recovery Something seems to have gotten out of sync during the creation of rust-lang#81177, where both the argument and comment were introduced.

…twco tidy: check fluent files for style Inspired by rust-lang#100651 (comment) There were a lot of line length violations, so I've excepted that lint - I'm not sure if fluent files can be formatted to avoid long lines at all.

…e-diag, r=davidtwco Migrate lint reports in typeck::check_unused to LintDiagnostic In this PR, I migrate two lint reports in `typeck::check_unused` by `LintDiagnostic`, all of which is about extern crates. `@rustbot` label +A-translation r? rust-lang/diagnostics

update Miri Fixes rust-lang#100614 r? `@ghost`

matthiaskrgr · 2022-08-17T21:35:28Z

@bors r+ rollup=never p=8

bors · 2022-08-17T21:35:30Z

📌 Commit e76d218 has been approved by matthiaskrgr

It is now in the queue for this repository.

matthiaskrgr · 2022-08-17T21:35:53Z

#100682 is going to time out (sigh) so we might as well merge some other stuff with it :/

rust-log-analyzer · 2022-08-17T21:45:49Z

The job mingw-check failed! Check out the build log: (web) (plain)

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

configure: rust.debug-assertions := True
configure: rust.overflow-checks := True
configure: llvm.assertions      := True
configure: dist.missing-tools   := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
Attempting with retry: make prepare
---
* highest error code: E0790
Found 506 error codes
Found 0 error(s) in error codes
Done!
tidy error: /checkout/compiler/rustc_error_messages/locales/en-US/expand.ftl:7: trailing whitespace
tidy error: /checkout/compiler/rustc_error_messages/locales/en-US/expand.ftl:10: trailing whitespace
tidy error: /checkout/compiler/rustc_error_messages/locales/en-US/expand.ftl: missing trailing newline
some tidy checks failed
Build completed unsuccessfully in 0:00:09

bors · 2022-08-17T21:47:45Z

⌛ Testing commit e76d218 with merge 104b9cbe79a1635b8719ebd65ae729690cce1157...

rust-log-analyzer · 2022-08-17T21:54:28Z

A job failed! Check out the build log: (web) (plain)

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

RalfJung and others added 26 commits July 30, 2022 17:17

avoid assertion failures in try_to_scalar_int

848f301

Improving Fuchsia rustc support documentation

a73afe3

Improving wording

point at a type parameter shadowing another type

1886aef

avoid a &str to String conversion

5a848c7

Added first migration for repeated expressions without syntax vars

7e15fba

Migrated more diagnostics under transcribe.rs

be18a9b

Previous commit under x.py fmt

72ce216

Fix documentation of rustc_parse::parser::Parser::parse_stmt_without_…

d3bf103

…recovery Something seems to have gotten out of sync during the creation of rust-lang#81177, where both the argument and comment were introduced.

tidy: check fluent files for style

db48436

fluent: fix slug name for borrowck::generic_does_not_live_long_enough

fd05fa0

Migrate lint reports in typeck::check_unused to LintDiagnostic

98fb65e

use suggestion_short in LintDiagnostic

52418d6

Co-authored-by: David Wood <agile.lion3441@fuligin.ink>

fix test file

b704843

update Miri

2c9baf7

remove #[primary_span]

9efe979

Moved structs to rustc_expand::errors, added several more migrations,…

c6f9a9c

… fixed slug name

Moved structs to rustc_expand::errors, added several more migrations,…

caab20c

… fixed slug name

Hotfix for duplicated slug name on VarStillRepeating struct

a468f13

Rollup merge of rust-lang#100643 - TaKO8Ki:point-at-type-parameter-sh…

33a451c

…adowing-another-type, r=estebank Point at a type parameter shadowing another type This patch fixes a part of rust-lang#97459.

Rollup merge of rust-lang#100651 - nidnogg:diagnostics_migration_expa…

ca0abf8

…nd_transcribe, r=davidtwco Migrations for rustc_expand transcribe.rs This PR includes some migrations to the new diagnostics API for the `rustc_expand` module. r? `@davidtwco`

Rollup merge of rust-lang#100682 - RalfJung:miri, r=RalfJung

e76d218

update Miri Fixes rust-lang#100614 r? `@ghost`

rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 17, 2022

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

matthiaskrgr mentioned this pull request Aug 17, 2022

tidy: check fluent files for style #100671

Merged

matthiaskrgr closed this Aug 17, 2022

davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022

matthiaskrgr deleted the rollup-elzuxlw branch October 9, 2022 00:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests #100701

Rollup of 8 pull requests #100701

Uh oh!

matthiaskrgr commented Aug 17, 2022

Uh oh!

matthiaskrgr commented Aug 17, 2022

Uh oh!

bors commented Aug 17, 2022

Uh oh!

matthiaskrgr commented Aug 17, 2022

Uh oh!

rust-log-analyzer commented Aug 17, 2022

Uh oh!

bors commented Aug 17, 2022

Uh oh!

rust-log-analyzer commented Aug 17, 2022

Uh oh!

Uh oh!

Rollup of 8 pull requests #100701

Rollup of 8 pull requests #100701

Uh oh!

Conversation

matthiaskrgr commented Aug 17, 2022

Uh oh!

matthiaskrgr commented Aug 17, 2022

Uh oh!

bors commented Aug 17, 2022

Uh oh!

matthiaskrgr commented Aug 17, 2022

Uh oh!

rust-log-analyzer commented Aug 17, 2022

Uh oh!

bors commented Aug 17, 2022

Uh oh!

rust-log-analyzer commented Aug 17, 2022

Uh oh!

Uh oh!