Skip to content

Commit 3d15039

Browse files
borsbors
committed
Auto merge of #30470 - petrochenkov:owned5, r=nrc
cc #30095 r? @nrc
2 parents 19c997e + e3da2a9 commit 3d15039

File tree

9 files changed

+69
-34
lines changed

9 files changed

+69
-34
lines changed

‎src/librustc/middle/infer/error_reporting.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -1137,11 +1137,11 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> {
11371137
}
11381138

11391139
fn rebuild_ty_params(&self,
1140-
ty_params: P<[hir::TyParam]>,
1140+
ty_params: hir::HirVec<hir::TyParam>,
11411141
lifetime: hir::Lifetime,
11421142
region_names: &HashSet<ast::Name>)
1143-
-> P<[hir::TyParam]> {
1144-
ty_params.map(|ty_param| {
1143+
-> hir::HirVec<hir::TyParam> {
1144+
ty_params.iter().map(|ty_param| {
11451145
let bounds = self.rebuild_ty_param_bounds(ty_param.bounds.clone(),
11461146
lifetime,
11471147
region_names);
@@ -1152,15 +1152,15 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> {
11521152
default: ty_param.default.clone(),
11531153
span: ty_param.span,
11541154
}
1155-
})
1155+
}).collect()
11561156
}
11571157

11581158
fn rebuild_ty_param_bounds(&self,
11591159
ty_param_bounds: hir::TyParamBounds,
11601160
lifetime: hir::Lifetime,
11611161
region_names: &HashSet<ast::Name>)
11621162
-> hir::TyParamBounds {
1163-
ty_param_bounds.map(|tpb| {
1163+
ty_param_bounds.iter().map(|tpb| {
11641164
match tpb {
11651165
&hir::RegionTyParamBound(lt) => {
11661166
// FIXME -- it's unclear whether I'm supposed to
@@ -1196,7 +1196,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> {
11961196
}, modifier)
11971197
}
11981198
}
1199-
})
1199+
}).collect()
12001200
}
12011201

12021202
fn rebuild_expl_self(&self,
@@ -1232,7 +1232,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> {
12321232
add: &Vec<hir::Lifetime>,
12331233
keep: &HashSet<ast::Name>,
12341234
remove: &HashSet<ast::Name>,
1235-
ty_params: P<[hir::TyParam]>,
1235+
ty_params: hir::HirVec<hir::TyParam>,
12361236
where_clause: hir::WhereClause)
12371237
-> hir::Generics {
12381238
let mut lifetimes = Vec::new();
@@ -1482,10 +1482,10 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> {
14821482
}
14831483
}
14841484
}
1485-
let new_types = data.types.map(|t| {
1485+
let new_types = data.types.iter().map(|t| {
14861486
self.rebuild_arg_ty_or_output(&**t, lifetime, anon_nums, region_names)
1487-
});
1488-
let new_bindings = data.bindings.map(|b| {
1487+
}).collect();
1488+
let new_bindings = data.bindings.iter().map(|b| {
14891489
hir::TypeBinding {
14901490
id: b.id,
14911491
name: b.name,
@@ -1495,7 +1495,7 @@ impl<'a, 'tcx> Rebuilder<'a, 'tcx> {
14951495
region_names),
14961496
span: b.span
14971497
}
1498-
});
1498+
}).collect();
14991499
hir::AngleBracketedParameters(hir::AngleBracketedParameterData {
15001500
lifetimes: new_lts.into(),
15011501
types: new_types,

‎src/librustc_front/fold.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ pub trait Folder : Sized {
210210
noop_fold_ty_param(tp, self)
211211
}
212212

213-
fn fold_ty_params(&mut self, tps: P<[TyParam]>) -> P<[TyParam]> {
213+
fn fold_ty_params(&mut self, tps: HirVec<TyParam>) -> HirVec<TyParam> {
214214
noop_fold_ty_params(tps, self)
215215
}
216216

@@ -575,9 +575,9 @@ pub fn noop_fold_ty_param<T: Folder>(tp: TyParam, fld: &mut T) -> TyParam {
575575
}
576576
}
577577

578-
pub fn noop_fold_ty_params<T: Folder>(tps: P<[TyParam]>,
578+
pub fn noop_fold_ty_params<T: Folder>(tps: HirVec<TyParam>,
579579
fld: &mut T)
580-
-> P<[TyParam]> {
580+
-> HirVec<TyParam> {
581581
tps.move_map(|tp| fld.fold_ty_param(tp))
582582
}
583583

‎src/librustc_front/hir.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ use serialize::{Encodable, Decodable, Encoder, Decoder};
5656
/// It can be `Vec`, `P<[T]>` or potentially `Box<[T]>`, or some other container with similar
5757
/// behavior. Unlike AST, HIR is mostly a static structure, so we can use an owned slice instead
5858
/// of `Vec` to avoid keeping extra capacity.
59-
pub type HirVec<T> = Vec<T>;
59+
pub type HirVec<T> = P<[T]>;
6060

6161
macro_rules! hir_vec {
6262
($elem:expr; $n:expr) => (
@@ -208,8 +208,8 @@ impl PathParameters {
208208
pub fn none() -> PathParameters {
209209
AngleBracketedParameters(AngleBracketedParameterData {
210210
lifetimes: HirVec::new(),
211-
types: P::empty(),
212-
bindings: P::empty(),
211+
types: HirVec::new(),
212+
bindings: HirVec::new(),
213213
})
214214
}
215215

@@ -282,10 +282,10 @@ pub struct AngleBracketedParameterData {
282282
/// The lifetime parameters for this path segment.
283283
pub lifetimes: HirVec<Lifetime>,
284284
/// The type parameters for this path segment, if present.
285-
pub types: P<[P<Ty>]>,
285+
pub types: HirVec<P<Ty>>,
286286
/// Bindings (equality constraints) on associated types, if present.
287287
/// E.g., `Foo<A=Bar>`.
288-
pub bindings: P<[TypeBinding]>,
288+
pub bindings: HirVec<TypeBinding>,
289289
}
290290

291291
impl AngleBracketedParameterData {
@@ -325,7 +325,7 @@ pub enum TraitBoundModifier {
325325
Maybe,
326326
}
327327

328-
pub type TyParamBounds = P<[TyParamBound]>;
328+
pub type TyParamBounds = HirVec<TyParamBound>;
329329

330330
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
331331
pub struct TyParam {
@@ -341,7 +341,7 @@ pub struct TyParam {
341341
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
342342
pub struct Generics {
343343
pub lifetimes: HirVec<LifetimeDef>,
344-
pub ty_params: P<[TyParam]>,
344+
pub ty_params: HirVec<TyParam>,
345345
pub where_clause: WhereClause,
346346
}
347347

‎src/librustc_front/lowering.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ pub fn lower_ty_param(lctx: &LoweringContext, tp: &TyParam) -> hir::TyParam {
434434

435435
pub fn lower_ty_params(lctx: &LoweringContext,
436436
tps: &P<[TyParam]>)
437-
-> P<[hir::TyParam]> {
437+
-> hir::HirVec<hir::TyParam> {
438438
tps.iter().map(|tp| lower_ty_param(lctx, tp)).collect()
439439
}
440440

@@ -1776,19 +1776,19 @@ fn path_ident(span: Span, id: hir::Ident) -> hir::Path {
17761776
}
17771777

17781778
fn path(span: Span, strs: Vec<hir::Ident>) -> hir::Path {
1779-
path_all(span, false, strs, hir::HirVec::new(), Vec::new(), Vec::new())
1779+
path_all(span, false, strs, hir::HirVec::new(), hir::HirVec::new(), hir::HirVec::new())
17801780
}
17811781

17821782
fn path_global(span: Span, strs: Vec<hir::Ident>) -> hir::Path {
1783-
path_all(span, true, strs, hir::HirVec::new(), Vec::new(), Vec::new())
1783+
path_all(span, true, strs, hir::HirVec::new(), hir::HirVec::new(), hir::HirVec::new())
17841784
}
17851785

17861786
fn path_all(sp: Span,
17871787
global: bool,
17881788
mut idents: Vec<hir::Ident>,
17891789
lifetimes: hir::HirVec<hir::Lifetime>,
1790-
types: Vec<P<hir::Ty>>,
1791-
bindings: Vec<hir::TypeBinding>)
1790+
types: hir::HirVec<P<hir::Ty>>,
1791+
bindings: hir::HirVec<hir::TypeBinding>)
17921792
-> hir::Path {
17931793
let last_identifier = idents.pop().unwrap();
17941794
let mut segments: Vec<hir::PathSegment> = idents.into_iter()
@@ -1803,8 +1803,8 @@ fn path_all(sp: Span,
18031803
identifier: last_identifier,
18041804
parameters: hir::AngleBracketedParameters(hir::AngleBracketedParameterData {
18051805
lifetimes: lifetimes,
1806-
types: P::from_vec(types),
1807-
bindings: P::from_vec(bindings),
1806+
types: types,
1807+
bindings: bindings,
18081808
}),
18091809
});
18101810
hir::Path {

‎src/librustc_front/print/pprust.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ impl<'a> State<'a> {
519519
hir::TyBareFn(ref f) => {
520520
let generics = hir::Generics {
521521
lifetimes: f.lifetimes.clone(),
522-
ty_params: P::empty(),
522+
ty_params: hir::HirVec::new(),
523523
where_clause: hir::WhereClause {
524524
id: ast::DUMMY_NODE_ID,
525525
predicates: hir::HirVec::new(),
@@ -2263,7 +2263,7 @@ impl<'a> State<'a> {
22632263
}
22642264
let generics = hir::Generics {
22652265
lifetimes: hir::HirVec::new(),
2266-
ty_params: P::empty(),
2266+
ty_params: hir::HirVec::new(),
22672267
where_clause: hir::WhereClause {
22682268
id: ast::DUMMY_NODE_ID,
22692269
predicates: hir::HirVec::new(),

‎src/librustc_front/util.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ pub fn is_path(e: P<Expr>) -> bool {
335335
pub fn empty_generics() -> Generics {
336336
Generics {
337337
lifetimes: HirVec::new(),
338-
ty_params: P::empty(),
338+
ty_params: HirVec::new(),
339339
where_clause: WhereClause {
340340
id: DUMMY_NODE_ID,
341341
predicates: HirVec::new(),
@@ -353,8 +353,8 @@ pub fn ident_to_path(s: Span, ident: Ident) -> Path {
353353
identifier: ident,
354354
parameters: hir::AngleBracketedParameters(hir::AngleBracketedParameterData {
355355
lifetimes: HirVec::new(),
356-
types: P::empty(),
357-
bindings: P::empty(),
356+
types: HirVec::new(),
357+
bindings: HirVec::new(),
358358
}),
359359
}],
360360
}

‎src/librustc_mir/hair/cx/to_ref.rs

+10
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,13 @@ impl<'a,'tcx:'a,T,U> ToRef for &'tcx Vec<T>
6161
self.iter().map(|expr| expr.to_ref()).collect()
6262
}
6363
}
64+
65+
impl<'a,'tcx:'a,T,U> ToRef for &'tcx P<[T]>
66+
where &'tcx T: ToRef<Output=U>
67+
{
68+
type Output = Vec<U>;
69+
70+
fn to_ref(self) -> Vec<U> {
71+
self.iter().map(|expr| expr.to_ref()).collect()
72+
}
73+
}

‎src/librustc_typeck/check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4903,7 +4903,7 @@ pub fn may_break(cx: &ty::ctxt, id: ast::NodeId, b: &hir::Block) -> bool {
49034903
}
49044904

49054905
pub fn check_bounds_are_used<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
4906-
tps: &P<[hir::TyParam]>,
4906+
tps: &[hir::TyParam],
49074907
ty: Ty<'tcx>) {
49084908
debug!("check_bounds_are_used(n_tps={}, ty={:?})",
49094909
tps.len(), ty);

‎src/libsyntax/ptr.rs

+25
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ impl<T:fmt::Debug> fmt::Debug for P<[T]> {
130130
}
131131

132132
impl<T> P<[T]> {
133+
pub fn new() -> P<[T]> {
134+
P::empty()
135+
}
136+
133137
pub fn empty() -> P<[T]> {
134138
P { ptr: Default::default() }
135139
}
@@ -177,12 +181,33 @@ impl<T: Clone> Clone for P<[T]> {
177181
}
178182
}
179183

184+
impl<T> From<Vec<T>> for P<[T]> {
185+
fn from(v: Vec<T>) -> Self {
186+
P::from_vec(v)
187+
}
188+
}
189+
190+
impl<T> Into<Vec<T>> for P<[T]> {
191+
fn into(self) -> Vec<T> {
192+
self.into_vec()
193+
}
194+
}
195+
180196
impl<T> FromIterator<T> for P<[T]> {
181197
fn from_iter<I: IntoIterator<Item=T>>(iter: I) -> P<[T]> {
182198
P::from_vec(iter.into_iter().collect())
183199
}
184200
}
185201

202+
impl<T> IntoIterator for P<[T]> {
203+
type Item = T;
204+
type IntoIter = vec::IntoIter<T>;
205+
206+
fn into_iter(self) -> Self::IntoIter {
207+
self.into_vec().into_iter()
208+
}
209+
}
210+
186211
impl<'a, T> IntoIterator for &'a P<[T]> {
187212
type Item = &'a T;
188213
type IntoIter = slice::Iter<'a, T>;

0 commit comments

Comments
 (0)