Skip to content

Commit 4501819

Browse files
fee1-deadfee1-dead
committed
remove P 
1 parent 340e590 commit 4501819

17 files changed

+52
-56
lines changed

‎src/chains.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
use std::borrow::Cow;
5959
use std::cmp::min;
6060

61-
use rustc_ast::{ast, ptr};
61+
use rustc_ast::ast;
6262
use rustc_span::{BytePos, Span, symbol};
6363
use tracing::debug;
6464

@@ -187,7 +187,7 @@ enum ChainItemKind {
187187
MethodCall(
188188
ast::PathSegment,
189189
Vec<ast::GenericArg>,
190-
ThinVec<ptr::P<ast::Expr>>,
190+
ThinVec<Box<ast::Expr>>,
191191
),
192192
StructField(symbol::Ident),
193193
TupleField(symbol::Ident, bool),
@@ -343,7 +343,7 @@ impl ChainItem {
343343
fn rewrite_method_call(
344344
method_name: symbol::Ident,
345345
types: &[ast::GenericArg],
346-
args: &[ptr::P<ast::Expr>],
346+
args: &[Box<ast::Expr>],
347347
span: Span,
348348
context: &RewriteContext<'_>,
349349
shape: Shape,

‎src/closures.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustc_ast::{ast, ptr};
1+
use rustc_ast::ast;
22
use rustc_span::Span;
33
use thin_vec::thin_vec;
44
use tracing::debug;
@@ -165,7 +165,7 @@ fn rewrite_closure_with_block(
165165
let block = ast::Block {
166166
stmts: thin_vec![ast::Stmt {
167167
id: ast::NodeId::root(),
168-
kind: ast::StmtKind::Expr(ptr::P(body.clone())),
168+
kind: ast::StmtKind::Expr(Box::new(body.clone())),
169169
span: body.span,
170170
}],
171171
id: ast::NodeId::root(),

‎src/expr.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::cmp::min;
33

44
use itertools::Itertools;
55
use rustc_ast::token::{Delimiter, Lit, LitKind};
6-
use rustc_ast::{ForLoopKind, MatchKind, ast, ptr, token};
6+
use rustc_ast::{ForLoopKind, MatchKind, ast, token};
77
use rustc_span::{BytePos, Span};
88
use tracing::debug;
99

@@ -1368,7 +1368,7 @@ fn choose_separator_tactic(context: &RewriteContext<'_>, span: Span) -> Option<S
13681368
pub(crate) fn rewrite_call(
13691369
context: &RewriteContext<'_>,
13701370
callee: &str,
1371-
args: &[ptr::P<ast::Expr>],
1371+
args: &[Box<ast::Expr>],
13721372
span: Span,
13731373
shape: Shape,
13741374
) -> RewriteResult {
@@ -1634,7 +1634,7 @@ fn struct_lit_can_be_aligned(fields: &[ast::ExprField], has_base: bool) -> bool
16341634
fn rewrite_struct_lit<'a>(
16351635
context: &RewriteContext<'_>,
16361636
path: &ast::Path,
1637-
qself: &Option<ptr::P<ast::QSelf>>,
1637+
qself: &Option<Box<ast::QSelf>>,
16381638
fields: &'a [ast::ExprField],
16391639
struct_rest: &ast::StructRest,
16401640
attrs: &[ast::Attribute],

‎src/items.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use std::borrow::Cow;
44
use std::cmp::{Ordering, max, min};
55

66
use regex::Regex;
7+
use rustc_ast::ast;
78
use rustc_ast::visit;
8-
use rustc_ast::{ast, ptr};
99
use rustc_span::{BytePos, DUMMY_SP, Ident, Span, symbol};
1010
use tracing::debug;
1111

@@ -725,9 +725,9 @@ impl<'a> FmtVisitor<'a> {
725725
.ok()
726726
}
727727

728-
fn visit_impl_items(&mut self, items: &[ptr::P<ast::AssocItem>]) {
728+
fn visit_impl_items(&mut self, items: &[Box<ast::AssocItem>]) {
729729
if self.get_context().config.reorder_impl_items() {
730-
type TyOpt = Option<ptr::P<ast::Ty>>;
730+
type TyOpt = Option<Box<ast::Ty>>;
731731
use crate::ast::AssocItemKind::*;
732732
let is_type = |ty: &TyOpt| opaque_ty(ty).is_none();
733733
let is_opaque = |ty: &TyOpt| opaque_ty(ty).is_some();
@@ -934,7 +934,7 @@ pub(crate) fn format_impl(
934934

935935
fn is_impl_single_line(
936936
context: &RewriteContext<'_>,
937-
items: &[ptr::P<ast::AssocItem>],
937+
items: &[Box<ast::AssocItem>],
938938
result: &str,
939939
where_clause_str: &str,
940940
item: &ast::Item,
@@ -2024,7 +2024,7 @@ pub(crate) struct StaticParts<'a> {
20242024
generics: Option<&'a ast::Generics>,
20252025
ty: &'a ast::Ty,
20262026
mutability: ast::Mutability,
2027-
expr_opt: Option<&'a ptr::P<ast::Expr>>,
2027+
expr_opt: Option<&'a Box<ast::Expr>>,
20282028
defaultness: Option<ast::Defaultness>,
20292029
span: Span,
20302030
}

‎src/macros.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use std::collections::HashMap;
1313
use std::panic::{AssertUnwindSafe, catch_unwind};
1414

15+
use rustc_ast::ast;
1516
use rustc_ast::token::{Delimiter, Token, TokenKind};
1617
use rustc_ast::tokenstream::{TokenStream, TokenStreamIter, TokenTree};
17-
use rustc_ast::{ast, ptr};
1818
use rustc_ast_pretty::pprust;
1919
use rustc_span::{BytePos, DUMMY_SP, Ident, Span, Symbol};
2020
use tracing::debug;
@@ -53,10 +53,10 @@ pub(crate) enum MacroPosition {
5353

5454
#[derive(Debug)]
5555
pub(crate) enum MacroArg {
56-
Expr(ptr::P<ast::Expr>),
57-
Ty(ptr::P<ast::Ty>),
58-
Pat(ptr::P<ast::Pat>),
59-
Item(ptr::P<ast::Item>),
56+
Expr(Box<ast::Expr>),
57+
Ty(Box<ast::Ty>),
58+
Pat(Box<ast::Pat>),
59+
Item(Box<ast::Item>),
6060
Keyword(Ident, Span),
6161
}
6262

‎src/matches.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use std::iter::repeat;
44

5-
use rustc_ast::{MatchKind, ast, ptr};
5+
use rustc_ast::{MatchKind, ast};
66
use rustc_span::{BytePos, Span};
77
use tracing::debug;
88

@@ -394,7 +394,7 @@ fn flatten_arm_body<'a>(
394394

395395
fn rewrite_match_body(
396396
context: &RewriteContext<'_>,
397-
body: &ptr::P<ast::Expr>,
397+
body: &Box<ast::Expr>,
398398
pats_str: &str,
399399
shape: Shape,
400400
has_guard: bool,
@@ -569,7 +569,7 @@ fn rewrite_match_body(
569569
// The `if ...` guard on a match arm.
570570
fn rewrite_guard(
571571
context: &RewriteContext<'_>,
572-
guard: &Option<ptr::P<ast::Expr>>,
572+
guard: &Option<Box<ast::Expr>>,
573573
shape: Shape,
574574
// The amount of space used up on this line for the pattern in
575575
// the arm (excludes offset).

‎src/modules.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type FileModMap<'ast> = BTreeMap<FileName, Module<'ast>>;
2626
#[derive(Debug, Clone)]
2727
pub(crate) struct Module<'a> {
2828
ast_mod_kind: Option<Cow<'a, ast::ModKind>>,
29-
pub(crate) items: Cow<'a, ThinVec<rustc_ast::ptr::P<ast::Item>>>,
29+
pub(crate) items: Cow<'a, ThinVec<Box<ast::Item>>>,
3030
inner_attr: ast::AttrVec,
3131
pub(crate) span: Span,
3232
}
@@ -35,7 +35,7 @@ impl<'a> Module<'a> {
3535
pub(crate) fn new(
3636
mod_span: Span,
3737
ast_mod_kind: Option<Cow<'a, ast::ModKind>>,
38-
mod_items: Cow<'a, ThinVec<rustc_ast::ptr::P<ast::Item>>>,
38+
mod_items: Cow<'a, ThinVec<Box<ast::Item>>>,
3939
mod_attrs: Cow<'a, ast::AttrVec>,
4040
) -> Self {
4141
let inner_attr = mod_attrs
@@ -170,7 +170,7 @@ impl<'ast, 'psess, 'c> ModResolver<'ast, 'psess> {
170170
/// Visit modules defined inside macro calls.
171171
fn visit_mod_outside_ast(
172172
&mut self,
173-
items: ThinVec<rustc_ast::ptr::P<ast::Item>>,
173+
items: ThinVec<Box<ast::Item>>,
174174
) -> Result<(), ModuleResolutionError> {
175175
for item in items {
176176
if is_cfg_if(&item) {
@@ -197,7 +197,7 @@ impl<'ast, 'psess, 'c> ModResolver<'ast, 'psess> {
197197
/// Visit modules from AST.
198198
fn visit_mod_from_ast(
199199
&mut self,
200-
items: &'ast [rustc_ast::ptr::P<ast::Item>],
200+
items: &'ast [Box<ast::Item>],
201201
) -> Result<(), ModuleResolutionError> {
202202
for item in items {
203203
if is_cfg_if(item) {

‎src/overflow.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
use std::cmp::min;
44

55
use itertools::Itertools;
6+
use rustc_ast::ast;
67
use rustc_ast::token::Delimiter;
7-
use rustc_ast::{ast, ptr};
88
use rustc_span::Span;
99
use tracing::debug;
1010

@@ -219,7 +219,7 @@ pub(crate) trait IntoOverflowableItem<'a>: Rewrite + Spanned {
219219
fn into_overflowable_item(&'a self) -> OverflowableItem<'a>;
220220
}
221221

222-
impl<'a, T: 'a + IntoOverflowableItem<'a>> IntoOverflowableItem<'a> for ptr::P<T> {
222+
impl<'a, T: 'a + IntoOverflowableItem<'a>> IntoOverflowableItem<'a> for Box<T> {
223223
fn into_overflowable_item(&'a self) -> OverflowableItem<'a> {
224224
(**self).into_overflowable_item()
225225
}

‎src/parse/macros/lazy_static.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use rustc_ast::ast;
2-
use rustc_ast::ptr::P;
32
use rustc_ast::token;
43
use rustc_ast::tokenstream::TokenStream;
54
use rustc_parse::exp;
@@ -10,7 +9,7 @@ use crate::rewrite::RewriteContext;
109
pub(crate) fn parse_lazy_static(
1110
context: &RewriteContext<'_>,
1211
ts: TokenStream,
13-
) -> Option<Vec<(ast::Visibility, symbol::Ident, P<ast::Ty>, P<ast::Expr>)>> {
12+
) -> Option<Vec<(ast::Visibility, symbol::Ident, Box<ast::Ty>, Box<ast::Expr>)>> {
1413
let mut result = vec![];
1514
let mut parser = super::build_parser(context, ts);
1615
macro_rules! parse_or {

‎src/parse/macros/mod.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use rustc_ast::ast;
12
use rustc_ast::token::{Delimiter, NonterminalKind, NtExprKind::*, NtPatKind::*, TokenKind};
23
use rustc_ast::tokenstream::TokenStream;
3-
use rustc_ast::{ast, ptr};
44
use rustc_parse::MACRO_ARGUMENTS;
55
use rustc_parse::parser::{ForceCollect, Parser, Recovery};
66
use rustc_session::parse::ParseSess;
@@ -49,26 +49,26 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {
4949
Expr,
5050
NonterminalKind::Expr(Expr),
5151
|parser: &mut Parser<'b>| parser.parse_expr(),
52-
|x: ptr::P<ast::Expr>| Some(x)
52+
|x: Box<ast::Expr>| Some(x)
5353
);
5454
parse_macro_arg!(
5555
Ty,
5656
NonterminalKind::Ty,
5757
|parser: &mut Parser<'b>| parser.parse_ty(),
58-
|x: ptr::P<ast::Ty>| Some(x)
58+
|x: Box<ast::Ty>| Some(x)
5959
);
6060
parse_macro_arg!(
6161
Pat,
6262
NonterminalKind::Pat(PatParam { inferred: false }),
6363
|parser: &mut Parser<'b>| parser.parse_pat_no_top_alt(None, None),
64-
|x: ptr::P<ast::Pat>| Some(x)
64+
|x: Box<ast::Pat>| Some(x)
6565
);
66-
// `parse_item` returns `Option<ptr::P<ast::Item>>`.
66+
// `parse_item` returns `Option<Box<ast::Item>>`.
6767
parse_macro_arg!(
6868
Item,
6969
NonterminalKind::Item,
7070
|parser: &mut Parser<'b>| parser.parse_item(ForceCollect::No),
71-
|x: Option<ptr::P<ast::Item>>| x
71+
|x: Option<Box<ast::Item>>| x
7272
);
7373

7474
None
@@ -164,7 +164,7 @@ pub(crate) fn parse_macro_args(
164164
pub(crate) fn parse_expr(
165165
context: &RewriteContext<'_>,
166166
tokens: TokenStream,
167-
) -> Option<ptr::P<ast::Expr>> {
167+
) -> Option<Box<ast::Expr>> {
168168
let mut parser = build_parser(context, tokens);
169169
parser.parse_expr().ok()
170170
}

0 commit comments

Comments
 (0)