user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #152314 - Zalathar:rollup-4WUNK14, r=Zalathar

Browse source 
Rollup of 2 pull requests

Successful merges:

 - rust-lang/rust#152310 (Remove `rustdoc` adhoc group)
 - rust-lang/rust#152284 (Avoid a bogus THIR span for `let x = offset_of!(..)`)
This commit is contained in:
bors 2026-02-08 01:54:58 +00:00
commit 08a4ce529f
5 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir_build/src/thir/cx/block.rs
View file

@ -75,8 +75,13 @@ impl<'tcx> ThirBuildCx<'tcx> {
debug!(?pattern);
let span = match local.init {
Some(init) => local.span.with_hi(init.span.hi()),
None => local.span,
Some(init)
if let Some(init_span) =
init.span.find_ancestor_inside_same_ctxt(local.span) =>
{
local.span.with_hi(init_span.hi())
}
Some(_) | None => local.span,
};
let stmt = Stmt {
kind: StmtKind::Let {

19
tests/ui/span/let-offset-of.rs Normal file
View file

@ -0,0 +1,19 @@
#![crate_type = "rlib"]
//@ edition: 2024
//@ check-pass
// Using `offset_of` in the RHS of a let-else statement should not produce
// malformed spans or a blank diagnostic snippet.
//
// Regression test for <https://github.com/rust-lang/rust/pull/152284>.
fn init_to_offset_of() {
use std::mem::offset_of;
struct Foo { field: u32 }
if let x = offset_of!(Foo, field) {}
//~^ WARN irrefutable `if let` pattern
let x = offset_of!(Foo, field) else { return; };
//~^ WARN irrefutable `let...else` pattern
}

21
tests/ui/span/let-offset-of.stderr Normal file
View file

@ -0,0 +1,21 @@
warning: irrefutable `if let` pattern
--> $DIR/let-offset-of.rs:14:8
|
LL | if let x = offset_of!(Foo, field) {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: this pattern will always match, so the `if let` is useless
= help: consider replacing the `if let` with a `let`
= note: `#[warn(irrefutable_let_patterns)]` on by default
warning: irrefutable `let...else` pattern
--> $DIR/let-offset-of.rs:17:5
|
LL | let x = offset_of!(Foo, field) else { return; };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: this pattern will always match, so the `else` clause is useless
= help: consider removing the `else` clause
warning: 2 warnings emitted

18
tests/ui/thir-print/offset_of.stdout
View file

@ -68,7 +68,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::concrete).10)
span: $DIR/offset_of.rs:37:5: 1445:57 (#0)
span: $DIR/offset_of.rs:37:5: 37:33 (#0)
}
}
Stmt {
@ -117,7 +117,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::concrete).20)
span: $DIR/offset_of.rs:38:5: 1445:57 (#0)
span: $DIR/offset_of.rs:38:5: 38:33 (#0)
}
}
Stmt {
@ -166,7 +166,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::concrete).30)
span: $DIR/offset_of.rs:39:5: 1445:57 (#0)
span: $DIR/offset_of.rs:39:5: 39:34 (#0)
}
}
Stmt {
@ -215,7 +215,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::concrete).40)
span: $DIR/offset_of.rs:40:5: 1445:57 (#0)
span: $DIR/offset_of.rs:40:5: 40:36 (#0)
}
}
Stmt {
@ -264,7 +264,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::concrete).50)
span: $DIR/offset_of.rs:41:5: 1445:57 (#0)
span: $DIR/offset_of.rs:41:5: 41:36 (#0)
}
}
]
@ -864,7 +864,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::generic).12)
span: $DIR/offset_of.rs:45:5: 1445:57 (#0)
span: $DIR/offset_of.rs:45:5: 45:37 (#0)
}
}
Stmt {
@ -913,7 +913,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::generic).24)
span: $DIR/offset_of.rs:46:5: 1445:57 (#0)
span: $DIR/offset_of.rs:46:5: 46:37 (#0)
}
}
Stmt {
@ -962,7 +962,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::generic).36)
span: $DIR/offset_of.rs:47:5: 1445:57 (#0)
span: $DIR/offset_of.rs:47:5: 47:37 (#0)
}
}
Stmt {
@ -1011,7 +1011,7 @@ body:
)
else_block: None
hir_id: HirId(DefId(offset_of::generic).48)
span: $DIR/offset_of.rs:48:5: 1445:57 (#0)
span: $DIR/offset_of.rs:48:5: 48:37 (#0)
}
}
]

5
triagebot.toml
View file

@ -1488,11 +1488,6 @@ infra-ci = [
"@jdno",
"@jieyouxu",
]
rustdoc = [
"@GuillaumeGomez",
"@notriddle",
"@fmease",
]
docs = [
"@ehuss",
"@GuillaumeGomez",