Skip to content

Commit a1ca449

Browse files
borsbors
committed
Auto merge of rust-lang#126655 - jieyouxu:rollup-z7k1k6l, r=jieyouxu
Rollup of 10 pull requests Successful merges: - rust-lang#124135 (delegation: Implement glob delegation) - rust-lang#125078 (fix: break inside async closure has incorrect span for enclosing closure) - rust-lang#125293 (Place tail expression behind terminating scope) - rust-lang#126422 (Suggest using a standalone doctest for non-local impl defs) - rust-lang#126493 (safe transmute: support non-ZST, variantful, uninhabited enums) - rust-lang#126504 (Sync fuchsia test runner with clang test runner) - rust-lang#126558 (hir_typeck: be more conservative in making "note caller chooses ty param" note) - rust-lang#126586 (Add `@badboy` and `@BlackHoleFox` as Mac Catalyst maintainers) - rust-lang#126615 (Add `rustc-ice*` to `.gitignore`) - rust-lang#126632 (Replace `move||` with `move ||`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4e63822 + 7450ab7 commit a1ca449

File tree

76 files changed

+2188
-654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+2188
-654
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ build/
5252
/src/tools/x/target
5353
# Created by default with `src/ci/docker/run.sh`
5454
/obj/
55+
/rustc-ice*
5556

5657
## Temporary files
5758
*~

‎compiler/rustc_ast/src/ast.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3161,13 +3161,16 @@ pub struct Delegation {
31613161
pub path: Path,
31623162
pub rename: Option<Ident>,
31633163
pub body: Option<P<Block>>,
3164+
/// The item was expanded from a glob delegation item.
3165+
pub from_glob: bool,
31643166
}
31653167

31663168
#[derive(Clone, Encodable, Decodable, Debug)]
31673169
pub struct DelegationMac {
31683170
pub qself: Option<P<QSelf>>,
31693171
pub prefix: Path,
3170-
pub suffixes: ThinVec<(Ident, Option<Ident>)>,
3172+
// Some for list delegation, and None for glob delegation.
3173+
pub suffixes: Option<ThinVec<(Ident, Option<Ident>)>>,
31713174
pub body: Option<P<Block>>,
31723175
}
31733176

@@ -3294,7 +3297,7 @@ pub enum ItemKind {
32943297
///
32953298
/// E.g. `reuse <Type as Trait>::name { target_expr_template }`.
32963299
Delegation(Box<Delegation>),
3297-
/// A list delegation item (`reuse prefix::{a, b, c}`).
3300+
/// A list or glob delegation item (`reuse prefix::{a, b, c}`, `reuse prefix::*`).
32983301
/// Treated similarly to a macro call and expanded early.
32993302
DelegationMac(Box<DelegationMac>),
33003303
}
@@ -3375,7 +3378,7 @@ pub enum AssocItemKind {
33753378
MacCall(P<MacCall>),
33763379
/// An associated delegation item.
33773380
Delegation(Box<Delegation>),
3378-
/// An associated delegation item list.
3381+
/// An associated list or glob delegation item.
33793382
DelegationMac(Box<DelegationMac>),
33803383
}
33813384

‎compiler/rustc_ast/src/mut_visit.rs‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,14 @@ impl NoopVisitItemKind for ItemKind {
11621162
}
11631163
ItemKind::MacCall(m) => vis.visit_mac_call(m),
11641164
ItemKind::MacroDef(def) => vis.visit_macro_def(def),
1165-
ItemKind::Delegation(box Delegation { id, qself, path, rename, body }) => {
1165+
ItemKind::Delegation(box Delegation {
1166+
id,
1167+
qself,
1168+
path,
1169+
rename,
1170+
body,
1171+
from_glob: _,
1172+
}) => {
11661173
vis.visit_id(id);
11671174
vis.visit_qself(qself);
11681175
vis.visit_path(path);
@@ -1176,10 +1183,12 @@ impl NoopVisitItemKind for ItemKind {
11761183
ItemKind::DelegationMac(box DelegationMac { qself, prefix, suffixes, body }) => {
11771184
vis.visit_qself(qself);
11781185
vis.visit_path(prefix);
1179-
for (ident, rename) in suffixes {
1180-
vis.visit_ident(ident);
1181-
if let Some(rename) = rename {
1182-
vis.visit_ident(rename);
1186+
if let Some(suffixes) = suffixes {
1187+
for (ident, rename) in suffixes {
1188+
vis.visit_ident(ident);
1189+
if let Some(rename) = rename {
1190+
vis.visit_ident(rename);
1191+
}
11831192
}
11841193
}
11851194
if let Some(body) = body {
@@ -1218,7 +1227,14 @@ impl NoopVisitItemKind for AssocItemKind {
12181227
visit_opt(ty, |ty| visitor.visit_ty(ty));
12191228
}
12201229
AssocItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
1221-
AssocItemKind::Delegation(box Delegation { id, qself, path, rename, body }) => {
1230+
AssocItemKind::Delegation(box Delegation {
1231+
id,
1232+
qself,
1233+
path,
1234+
rename,
1235+
body,
1236+
from_glob: _,
1237+
}) => {
12221238
visitor.visit_id(id);
12231239
visitor.visit_qself(qself);
12241240
visitor.visit_path(path);
@@ -1232,10 +1248,12 @@ impl NoopVisitItemKind for AssocItemKind {
12321248
AssocItemKind::DelegationMac(box DelegationMac { qself, prefix, suffixes, body }) => {
12331249
visitor.visit_qself(qself);
12341250
visitor.visit_path(prefix);
1235-
for (ident, rename) in suffixes {
1236-
visitor.visit_ident(ident);
1237-
if let Some(rename) = rename {
1238-
visitor.visit_ident(rename);
1251+
if let Some(suffixes) = suffixes {
1252+
for (ident, rename) in suffixes {
1253+
visitor.visit_ident(ident);
1254+
if let Some(rename) = rename {
1255+
visitor.visit_ident(rename);
1256+
}
12391257
}
12401258
}
12411259
if let Some(body) = body {

‎compiler/rustc_ast/src/visit.rs‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,14 @@ impl WalkItemKind for ItemKind {
408408
}
409409
ItemKind::MacCall(mac) => try_visit!(visitor.visit_mac_call(mac)),
410410
ItemKind::MacroDef(ts) => try_visit!(visitor.visit_mac_def(ts, item.id)),
411-
ItemKind::Delegation(box Delegation { id, qself, path, rename, body }) => {
411+
ItemKind::Delegation(box Delegation {
412+
id,
413+
qself,
414+
path,
415+
rename,
416+
body,
417+
from_glob: _,
418+
}) => {
412419
if let Some(qself) = qself {
413420
try_visit!(visitor.visit_ty(&qself.ty));
414421
}
@@ -421,10 +428,12 @@ impl WalkItemKind for ItemKind {
421428
try_visit!(visitor.visit_ty(&qself.ty));
422429
}
423430
try_visit!(visitor.visit_path(prefix, item.id));
424-
for (ident, rename) in suffixes {
425-
visitor.visit_ident(*ident);
426-
if let Some(rename) = rename {
427-
visitor.visit_ident(*rename);
431+
if let Some(suffixes) = suffixes {
432+
for (ident, rename) in suffixes {
433+
visitor.visit_ident(*ident);
434+
if let Some(rename) = rename {
435+
visitor.visit_ident(*rename);
436+
}
428437
}
429438
}
430439
visit_opt!(visitor, visit_block, body);
@@ -837,7 +846,14 @@ impl WalkItemKind for AssocItemKind {
837846
AssocItemKind::MacCall(mac) => {
838847
try_visit!(visitor.visit_mac_call(mac));
839848
}
840-
AssocItemKind::Delegation(box Delegation { id, qself, path, rename, body }) => {
849+
AssocItemKind::Delegation(box Delegation {
850+
id,
851+
qself,
852+
path,
853+
rename,
854+
body,
855+
from_glob: _,
856+
}) => {
841857
if let Some(qself) = qself {
842858
try_visit!(visitor.visit_ty(&qself.ty));
843859
}
@@ -850,10 +866,12 @@ impl WalkItemKind for AssocItemKind {
850866
try_visit!(visitor.visit_ty(&qself.ty));
851867
}
852868
try_visit!(visitor.visit_path(prefix, item.id));
853-
for (ident, rename) in suffixes {
854-
visitor.visit_ident(*ident);
855-
if let Some(rename) = rename {
856-
visitor.visit_ident(*rename);
869+
if let Some(suffixes) = suffixes {
870+
for (ident, rename) in suffixes {
871+
visitor.visit_ident(*ident);
872+
if let Some(rename) = rename {
873+
visitor.visit_ident(*rename);
874+
}
857875
}
858876
}
859877
visit_opt!(visitor, visit_block, body);

‎compiler/rustc_ast_lowering/src/expr.rs‎

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,24 +1716,28 @@ impl<'hir> LoweringContext<'_, 'hir> {
17161716
// `mut iter => { ... }`
17171717
let iter_arm = self.arm(iter_pat, loop_expr);
17181718

1719-
let into_iter_expr = match loop_kind {
1719+
let match_expr = match loop_kind {
17201720
ForLoopKind::For => {
17211721
// `::std::iter::IntoIterator::into_iter(<head>)`
1722-
self.expr_call_lang_item_fn(
1722+
let into_iter_expr = self.expr_call_lang_item_fn(
17231723
head_span,
17241724
hir::LangItem::IntoIterIntoIter,
17251725
arena_vec![self; head],
1726-
)
1726+
);
1727+
1728+
self.arena.alloc(self.expr_match(
1729+
for_span,
1730+
into_iter_expr,
1731+
arena_vec![self; iter_arm],
1732+
hir::MatchSource::ForLoopDesugar,
1733+
))
17271734
}
1728-
// ` unsafe { Pin::new_unchecked(&mut into_async_iter(<head>)) }`
1735+
// `match into_async_iter(<head>) { ref mut iter => match unsafe { Pin::new_unchecked(iter) } { ... } }`
17291736
ForLoopKind::ForAwait => {
1730-
// `::core::async_iter::IntoAsyncIterator::into_async_iter(<head>)`
1731-
let iter = self.expr_call_lang_item_fn(
1732-
head_span,
1733-
hir::LangItem::IntoAsyncIterIntoIter,
1734-
arena_vec![self; head],
1735-
);
1736-
let iter = self.expr_mut_addr_of(head_span, iter);
1737+
let iter_ident = iter;
1738+
let (async_iter_pat, async_iter_pat_id) =
1739+
self.pat_ident_binding_mode(head_span, iter_ident, hir::BindingMode::REF_MUT);
1740+
let iter = self.expr_ident_mut(head_span, iter_ident, async_iter_pat_id);
17371741
// `Pin::new_unchecked(...)`
17381742
let iter = self.arena.alloc(self.expr_call_lang_item_fn_mut(
17391743
head_span,
@@ -1742,17 +1746,29 @@ impl<'hir> LoweringContext<'_, 'hir> {
17421746
));
17431747
// `unsafe { ... }`
17441748
let iter = self.arena.alloc(self.expr_unsafe(iter));
1745-
iter
1749+
let inner_match_expr = self.arena.alloc(self.expr_match(
1750+
for_span,
1751+
iter,
1752+
arena_vec![self; iter_arm],
1753+
hir::MatchSource::ForLoopDesugar,
1754+
));
1755+
1756+
// `::core::async_iter::IntoAsyncIterator::into_async_iter(<head>)`
1757+
let iter = self.expr_call_lang_item_fn(
1758+
head_span,
1759+
hir::LangItem::IntoAsyncIterIntoIter,
1760+
arena_vec![self; head],
1761+
);
1762+
let iter_arm = self.arm(async_iter_pat, inner_match_expr);
1763+
self.arena.alloc(self.expr_match(
1764+
for_span,
1765+
iter,
1766+
arena_vec![self; iter_arm],
1767+
hir::MatchSource::ForLoopDesugar,
1768+
))
17461769
}
17471770
};
17481771

1749-
let match_expr = self.arena.alloc(self.expr_match(
1750-
for_span,
1751-
into_iter_expr,
1752-
arena_vec![self; iter_arm],
1753-
hir::MatchSource::ForLoopDesugar,
1754-
));
1755-
17561772
// This is effectively `{ let _result = ...; _result }`.
17571773
// The construct was introduced in #21984 and is necessary to make sure that
17581774
// temporaries in the `head` expression are dropped and do not leak to the

‎compiler/rustc_ast_lowering/src/item.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,14 @@ impl<'hir> LoweringContext<'_, 'hir> {
13191319
CoroutineKind::AsyncGen { .. } => hir::CoroutineDesugaring::AsyncGen,
13201320
};
13211321
let closure_id = coroutine_kind.closure_id();
1322+
1323+
let span = if let FnRetTy::Default(span) = decl.output
1324+
&& matches!(coroutine_source, rustc_hir::CoroutineSource::Closure)
1325+
{
1326+
body_span.with_lo(span.lo())
1327+
} else {
1328+
body_span
1329+
};
13221330
let coroutine_expr = self.make_desugared_coroutine_expr(
13231331
// The default capture mode here is by-ref. Later on during upvar analysis,
13241332
// we will force the captured arguments to by-move, but for async closures,
@@ -1327,7 +1335,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
13271335
CaptureBy::Ref,
13281336
closure_id,
13291337
None,
1330-
body_span,
1338+
span,
13311339
desugaring_kind,
13321340
coroutine_source,
13331341
mkbody,

‎compiler/rustc_ast_pretty/src/pprust/state/item.rs‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ use rustc_ast::ptr::P;
99
use rustc_ast::ModKind;
1010
use rustc_span::symbol::Ident;
1111

12+
enum DelegationKind<'a> {
13+
Single,
14+
List(&'a [(Ident, Option<Ident>)]),
15+
Glob,
16+
}
17+
1218
fn visibility_qualified(vis: &ast::Visibility, s: &str) -> String {
1319
format!("{}{}", State::to_string(|s| s.print_visibility(vis)), s)
1420
}
@@ -387,15 +393,15 @@ impl<'a> State<'a> {
387393
&item.vis,
388394
&deleg.qself,
389395
&deleg.path,
390-
None,
396+
DelegationKind::Single,
391397
&deleg.body,
392398
),
393399
ast::ItemKind::DelegationMac(deleg) => self.print_delegation(
394400
&item.attrs,
395401
&item.vis,
396402
&deleg.qself,
397403
&deleg.prefix,
398-
Some(&deleg.suffixes),
404+
deleg.suffixes.as_ref().map_or(DelegationKind::Glob, |s| DelegationKind::List(s)),
399405
&deleg.body,
400406
),
401407
}
@@ -579,28 +585,28 @@ impl<'a> State<'a> {
579585
vis,
580586
&deleg.qself,
581587
&deleg.path,
582-
None,
588+
DelegationKind::Single,
583589
&deleg.body,
584590
),
585591
ast::AssocItemKind::DelegationMac(deleg) => self.print_delegation(
586592
&item.attrs,
587593
vis,
588594
&deleg.qself,
589595
&deleg.prefix,
590-
Some(&deleg.suffixes),
596+
deleg.suffixes.as_ref().map_or(DelegationKind::Glob, |s| DelegationKind::List(s)),
591597
&deleg.body,
592598
),
593599
}
594600
self.ann.post(self, AnnNode::SubItem(id))
595601
}
596602

597-
pub(crate) fn print_delegation(
603+
fn print_delegation(
598604
&mut self,
599605
attrs: &[ast::Attribute],
600606
vis: &ast::Visibility,
601607
qself: &Option<P<ast::QSelf>>,
602608
path: &ast::Path,
603-
suffixes: Option<&[(Ident, Option<Ident>)]>,
609+
kind: DelegationKind<'_>,
604610
body: &Option<P<ast::Block>>,
605611
) {
606612
if body.is_some() {
@@ -614,21 +620,28 @@ impl<'a> State<'a> {
614620
} else {
615621
self.print_path(path, false, 0);
616622
}
617-
if let Some(suffixes) = suffixes {
618-
self.word("::");
619-
self.word("{");
620-
for (i, (ident, rename)) in suffixes.iter().enumerate() {
621-
self.print_ident(*ident);
622-
if let Some(rename) = rename {
623-
self.nbsp();
624-
self.word_nbsp("as");
625-
self.print_ident(*rename);
626-
}
627-
if i != suffixes.len() - 1 {
628-
self.word_space(",");
623+
match kind {
624+
DelegationKind::Single => {}
625+
DelegationKind::List(suffixes) => {
626+
self.word("::");
627+
self.word("{");
628+
for (i, (ident, rename)) in suffixes.iter().enumerate() {
629+
self.print_ident(*ident);
630+
if let Some(rename) = rename {
631+
self.nbsp();
632+
self.word_nbsp("as");
633+
self.print_ident(*rename);
634+
}
635+
if i != suffixes.len() - 1 {
636+
self.word_space(",");
637+
}
629638
}
639+
self.word("}");
640+
}
641+
DelegationKind::Glob => {
642+
self.word("::");
643+
self.word("*");
630644
}
631-
self.word("}");
632645
}
633646
if let Some(body) = body {
634647
self.nbsp();

0 commit comments

Comments
 (0)