Skip to content

Commit c0746b9

Browse files
eholkeholk
committed
Add sugar for &pin (const|mut) types
1 parent a18800f commit c0746b9

File tree

18 files changed

+159
-47
lines changed

18 files changed

+159
-47
lines changed

‎compiler/rustc_ast/src/ast.rs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use std::borrow::Cow;
2222
use std::{cmp, fmt, mem};
2323

24-
pub use rustc_ast_ir::{Movability, Mutability};
24+
pub use rustc_ast_ir::{Movability, Mutability, Pinnedness};
2525
use rustc_data_structures::packed::Pu128;
2626
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
2727
use rustc_data_structures::stack::ensure_sufficient_stack;
@@ -580,9 +580,9 @@ impl Pat {
580580
PatKind::Path(qself, path) => TyKind::Path(qself.clone(), path.clone()),
581581
PatKind::MacCall(mac) => TyKind::MacCall(mac.clone()),
582582
// `&mut? P` can be reinterpreted as `&mut? T` where `T` is `P` reparsed as a type.
583-
PatKind::Ref(pat, mutbl) => {
584-
pat.to_ty().map(|ty| TyKind::Ref(None, MutTy { ty, mutbl: *mutbl }))?
585-
}
583+
PatKind::Ref(pat, mutbl) => pat
584+
.to_ty()
585+
.map(|ty| TyKind::Ref(None, Pinnedness::Not, MutTy { ty, mutbl: *mutbl }))?,
586586
// A slice/array pattern `[P]` can be reparsed as `[T]`, an unsized array,
587587
// when `P` can be reparsed as a type `T`.
588588
PatKind::Slice(pats) if let [pat] = pats.as_slice() => {
@@ -1246,9 +1246,9 @@ impl Expr {
12461246

12471247
ExprKind::Paren(expr) => expr.to_ty().map(TyKind::Paren)?,
12481248

1249-
ExprKind::AddrOf(BorrowKind::Ref, mutbl, expr) => {
1250-
expr.to_ty().map(|ty| TyKind::Ref(None, MutTy { ty, mutbl: *mutbl }))?
1251-
}
1249+
ExprKind::AddrOf(BorrowKind::Ref, mutbl, expr) => expr
1250+
.to_ty()
1251+
.map(|ty| TyKind::Ref(None, Pinnedness::Not, MutTy { ty, mutbl: *mutbl }))?,
12521252

12531253
ExprKind::Repeat(expr, expr_len) => {
12541254
expr.to_ty().map(|ty| TyKind::Array(ty, expr_len.clone()))?
@@ -2127,7 +2127,8 @@ impl Clone for Ty {
21272127
impl Ty {
21282128
pub fn peel_refs(&self) -> &Self {
21292129
let mut final_ty = self;
2130-
while let TyKind::Ref(_, MutTy { ty, .. }) | TyKind::Ptr(MutTy { ty, .. }) = &final_ty.kind
2130+
while let TyKind::Ref(_, _, MutTy { ty, .. }) | TyKind::Ptr(MutTy { ty, .. }) =
2131+
&final_ty.kind
21312132
{
21322133
final_ty = ty;
21332134
}
@@ -2158,7 +2159,7 @@ pub enum TyKind {
21582159
/// A raw pointer (`*const T` or `*mut T`).
21592160
Ptr(MutTy),
21602161
/// A reference (`&'a T` or `&'a mut T`).
2161-
Ref(Option<Lifetime>, MutTy),
2162+
Ref(Option<Lifetime>, Pinnedness, MutTy),
21622163
/// A bare function (e.g., `fn(usize) -> bool`).
21632164
BareFn(P<BareFnTy>),
21642165
/// The never type (`!`).
@@ -2481,7 +2482,7 @@ impl Param {
24812482
if ident.name == kw::SelfLower {
24822483
return match self.ty.kind {
24832484
TyKind::ImplicitSelf => Some(respan(self.pat.span, SelfKind::Value(mutbl))),
2484-
TyKind::Ref(lt, MutTy { ref ty, mutbl }) if ty.kind.is_implicit_self() => {
2485+
TyKind::Ref(lt, _, MutTy { ref ty, mutbl }) if ty.kind.is_implicit_self() => {
24852486
Some(respan(self.pat.span, SelfKind::Region(lt, mutbl)))
24862487
}
24872488
_ => Some(respan(
@@ -2519,7 +2520,7 @@ impl Param {
25192520
Mutability::Not,
25202521
P(Ty {
25212522
id: DUMMY_NODE_ID,
2522-
kind: TyKind::Ref(lt, MutTy { ty: infer_ty, mutbl }),
2523+
kind: TyKind::Ref(lt, Pinnedness::Not, MutTy { ty: infer_ty, mutbl }),
25232524
span,
25242525
tokens: None,
25252526
}),

‎compiler/rustc_ast/src/mut_visit.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ pub fn walk_ty<T: MutVisitor>(vis: &mut T, ty: &mut P<Ty>) {
485485
}
486486
TyKind::Slice(ty) => vis.visit_ty(ty),
487487
TyKind::Ptr(mt) => vis.visit_mt(mt),
488-
TyKind::Ref(lt, mt) => {
488+
TyKind::Ref(lt, _, mt) => {
489489
visit_opt(lt, |lt| vis.visit_lifetime(lt));
490490
vis.visit_mt(mt);
491491
}

‎compiler/rustc_ast/src/util/classify.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ fn type_trailing_braced_mac_call(mut ty: &ast::Ty) -> Option<&ast::MacCall> {
247247
break (mac.args.delim == Delimiter::Brace).then_some(mac);
248248
}
249249

250-
ast::TyKind::Ptr(mut_ty) | ast::TyKind::Ref(_, mut_ty) => {
250+
ast::TyKind::Ptr(mut_ty) | ast::TyKind::Ref(_, _, mut_ty) => {
251251
ty = &mut_ty.ty;
252252
}
253253

‎compiler/rustc_ast/src/visit.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) -> V::Result {
499499
match kind {
500500
TyKind::Slice(ty) | TyKind::Paren(ty) => try_visit!(visitor.visit_ty(ty)),
501501
TyKind::Ptr(MutTy { ty, mutbl: _ }) => try_visit!(visitor.visit_ty(ty)),
502-
TyKind::Ref(opt_lifetime, MutTy { ty, mutbl: _ }) => {
502+
TyKind::Ref(opt_lifetime, _, MutTy { ty, mutbl: _ }) => {
503503
visit_opt!(visitor, visit_lifetime, opt_lifetime, LifetimeCtxt::Ref);
504504
try_visit!(visitor.visit_ty(ty));
505505
}

‎compiler/rustc_ast_ir/src/lib.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,10 @@ impl Mutability {
7979
matches!(self, Self::Not)
8080
}
8181
}
82+
83+
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Copy)]
84+
#[cfg_attr(feature = "nightly", derive(Encodable, Decodable, HashStable_NoContext))]
85+
pub enum Pinnedness {
86+
Not,
87+
Pinned,
88+
}

‎compiler/rustc_ast_lowering/src/expr.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
638638
self.lower_span(span),
639639
Some(self.allow_gen_future.clone()),
640640
);
641-
let resume_ty = self.make_lang_item_qpath(hir::LangItem::ResumeTy, unstable_span);
641+
let resume_ty =
642+
self.make_lang_item_qpath(hir::LangItem::ResumeTy, unstable_span, None);
642643
let input_ty = hir::Ty {
643644
hir_id: self.next_id(),
644645
kind: hir::TyKind::Path(resume_ty),
@@ -2063,7 +2064,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
20632064
lang_item: hir::LangItem,
20642065
name: Symbol,
20652066
) -> hir::Expr<'hir> {
2066-
let qpath = self.make_lang_item_qpath(lang_item, self.lower_span(span));
2067+
let qpath = self.make_lang_item_qpath(lang_item, self.lower_span(span), None);
20672068
let path = hir::ExprKind::Path(hir::QPath::TypeRelative(
20682069
self.arena.alloc(self.ty(span, hir::TyKind::Path(qpath))),
20692070
self.arena.alloc(hir::PathSegment::new(

‎compiler/rustc_ast_lowering/src/lib.rs‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ use rustc_errors::{DiagArgFromDisplay, DiagCtxtHandle, StashKey};
5555
use rustc_hir::def::{DefKind, LifetimeRes, Namespace, PartialRes, PerNS, Res};
5656
use rustc_hir::def_id::{LocalDefId, LocalDefIdMap, CRATE_DEF_ID, LOCAL_CRATE};
5757
use rustc_hir::{
58-
self as hir, ConstArg, GenericArg, HirId, ItemLocalMap, MissingLifetimeKind, ParamName,
59-
TraitCandidate,
58+
self as hir, ConstArg, GenericArg, HirId, ItemLocalMap, LangItem, MissingLifetimeKind,
59+
ParamName, TraitCandidate,
6060
};
6161
use rustc_index::{Idx, IndexSlice, IndexVec};
6262
use rustc_macros::extension;
@@ -756,8 +756,13 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
756756
res
757757
}
758758

759-
fn make_lang_item_qpath(&mut self, lang_item: hir::LangItem, span: Span) -> hir::QPath<'hir> {
760-
hir::QPath::Resolved(None, self.make_lang_item_path(lang_item, span, None))
759+
fn make_lang_item_qpath(
760+
&mut self,
761+
lang_item: hir::LangItem,
762+
span: Span,
763+
args: Option<&'hir hir::GenericArgs<'hir>>,
764+
) -> hir::QPath<'hir> {
765+
hir::QPath::Resolved(None, self.make_lang_item_path(lang_item, span, args))
761766
}
762767

763768
fn make_lang_item_path(
@@ -1284,7 +1289,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
12841289
}
12851290
TyKind::Slice(ty) => hir::TyKind::Slice(self.lower_ty(ty, itctx)),
12861291
TyKind::Ptr(mt) => hir::TyKind::Ptr(self.lower_mt(mt, itctx)),
1287-
TyKind::Ref(region, mt) => {
1292+
TyKind::Ref(region, pinned, mt) => {
12881293
let region = region.unwrap_or_else(|| {
12891294
let id = if let Some(LifetimeRes::ElidedAnchor { start, end }) =
12901295
self.resolver.get_lifetime_res(t.id)
@@ -1298,7 +1303,22 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
12981303
Lifetime { ident: Ident::new(kw::UnderscoreLifetime, span), id }
12991304
});
13001305
let lifetime = self.lower_lifetime(&region);
1301-
hir::TyKind::Ref(lifetime, self.lower_mt(mt, itctx))
1306+
let kind = hir::TyKind::Ref(lifetime, self.lower_mt(mt, itctx));
1307+
match pinned {
1308+
Pinnedness::Not => kind,
1309+
Pinnedness::Pinned => {
1310+
let span = self.lower_span(t.span);
1311+
let arg = hir::Ty { kind, span, hir_id: self.next_id() };
1312+
let args = self.arena.alloc(hir::GenericArgs {
1313+
args: self.arena.alloc([hir::GenericArg::Type(self.arena.alloc(arg))]),
1314+
constraints: &[],
1315+
parenthesized: hir::GenericArgsParentheses::No,
1316+
span_ext: span,
1317+
});
1318+
let path = self.make_lang_item_qpath(LangItem::Pin, span, Some(args));
1319+
hir::TyKind::Path(path)
1320+
}
1321+
}
13021322
}
13031323
TyKind::BareFn(f) => {
13041324
let generic_params = self.lower_lifetime_binder(t.id, &f.generic_params);
@@ -1882,7 +1902,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
18821902
// Given we are only considering `ImplicitSelf` types, we needn't consider
18831903
// the case where we have a mutable pattern to a reference as that would
18841904
// no longer be an `ImplicitSelf`.
1885-
TyKind::Ref(_, mt) if mt.ty.kind.is_implicit_self() => match mt.mutbl {
1905+
TyKind::Ref(_, _, mt) if mt.ty.kind.is_implicit_self() => match mt.mutbl {
18861906
hir::Mutability::Not => hir::ImplicitSelfKind::RefImm,
18871907
hir::Mutability::Mut => hir::ImplicitSelfKind::RefMut,
18881908
},

‎compiler/rustc_ast_lowering/src/lifetime_collector.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl<'ast> Visitor<'ast> for LifetimeCollectVisitor<'ast> {
9595
visit::walk_ty(self, t);
9696
self.current_binders.pop();
9797
}
98-
TyKind::Ref(None, _) => {
98+
TyKind::Ref(None, _, _) => {
9999
self.record_elided_anchor(t.id, t.span);
100100
visit::walk_ty(self, t);
101101
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use rustc_ast::util::comments::{Comment, CommentStyle};
2020
use rustc_ast::{
2121
self as ast, attr, AttrArgs, AttrArgsEq, BindingMode, BlockCheckMode, ByRef, DelimArgs,
2222
GenericArg, GenericBound, InlineAsmOperand, InlineAsmOptions, InlineAsmRegOrRegClass,
23-
InlineAsmTemplatePiece, PatKind, RangeEnd, RangeSyntax, Safety, SelfKind, Term,
23+
InlineAsmTemplatePiece, PatKind, Pinnedness, RangeEnd, RangeSyntax, Safety, SelfKind, Term,
2424
};
2525
use rustc_span::edition::Edition;
2626
use rustc_span::source_map::{SourceMap, Spanned};
@@ -1158,10 +1158,13 @@ impl<'a> State<'a> {
11581158
self.word("*");
11591159
self.print_mt(mt, true);
11601160
}
1161-
ast::TyKind::Ref(lifetime, mt) => {
1161+
ast::TyKind::Ref(lifetime, pinned, mt) => {
11621162
self.word("&");
11631163
self.print_opt_lifetime(lifetime);
1164-
self.print_mt(mt, false);
1164+
if pinned == &Pinnedness::Pinned {
1165+
self.word("pin ");
1166+
}
1167+
self.print_mt(mt, pinned == &Pinnedness::Pinned);
11651168
}
11661169
ast::TyKind::Never => {
11671170
self.word("!");

‎compiler/rustc_expand/src/build.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use rustc_ast::ptr::P;
22
use rustc_ast::util::literal;
33
use rustc_ast::{
4-
self as ast, attr, token, AttrVec, BlockCheckMode, Expr, LocalKind, MatchKind, PatKind, UnOp,
4+
self as ast, attr, token, AttrVec, BlockCheckMode, Expr, LocalKind, MatchKind, PatKind,
5+
Pinnedness, UnOp,
56
};
67
use rustc_span::source_map::Spanned;
78
use rustc_span::symbol::{kw, sym, Ident, Symbol};
@@ -114,7 +115,7 @@ impl<'a> ExtCtxt<'a> {
114115
lifetime: Option<ast::Lifetime>,
115116
mutbl: ast::Mutability,
116117
) -> P<ast::Ty> {
117-
self.ty(span, ast::TyKind::Ref(lifetime, self.ty_mt(ty, mutbl)))
118+
self.ty(span, ast::TyKind::Ref(lifetime, Pinnedness::Not, self.ty_mt(ty, mutbl)))
118119
}
119120

120121
pub fn ty_ptr(&self, span: Span, ty: P<ast::Ty>, mutbl: ast::Mutability) -> P<ast::Ty> {

0 commit comments

Comments
 (0)