Skip to content

Commit d643946

Browse files
varkorvarkor
committed
Rename ast::GenericParam and ast::GenericArg
It's so confusing to have everything having the same name, at least while refactoring.
1 parent f9d0968 commit d643946

File tree

22 files changed

+123
-124
lines changed

22 files changed

+123
-124
lines changed

‎src/librustc/hir/lowering.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ impl<'a> LoweringContext<'a> {
810810
{
811811
let (in_band_defs, (mut lowered_generics, res)) = self.with_in_scope_lifetime_defs(
812812
generics.params.iter().filter_map(|p| match p {
813-
GenericParam::Lifetime(ld) => Some(ld),
813+
GenericParamAST::Lifetime(ld) => Some(ld),
814814
_ => None,
815815
}),
816816
|this| {
@@ -1040,14 +1040,14 @@ impl<'a> LoweringContext<'a> {
10401040
}
10411041

10421042
fn lower_generic_arg(&mut self,
1043-
p: &ast::GenericArg,
1043+
p: &ast::GenericArgAST,
10441044
itctx: ImplTraitContext)
10451045
-> hir::GenericArg {
10461046
match p {
1047-
ast::GenericArg::Lifetime(lt) => {
1047+
ast::GenericArgAST::Lifetime(lt) => {
10481048
GenericArg::Lifetime(self.lower_lifetime(&lt))
10491049
}
1050-
ast::GenericArg::Type(ty) => {
1050+
ast::GenericArgAST::Type(ty) => {
10511051
GenericArg::Type(self.lower_ty(&ty, itctx))
10521052
}
10531053
}
@@ -1069,7 +1069,7 @@ impl<'a> LoweringContext<'a> {
10691069
}
10701070
TyKind::BareFn(ref f) => self.with_in_scope_lifetime_defs(
10711071
f.generic_params.iter().filter_map(|p| match p {
1072-
GenericParam::Lifetime(ld) => Some(ld),
1072+
GenericParamAST::Lifetime(ld) => Some(ld),
10731073
_ => None,
10741074
}),
10751075
|this| {
@@ -1980,17 +1980,17 @@ impl<'a> LoweringContext<'a> {
19801980

19811981
fn lower_generic_params(
19821982
&mut self,
1983-
params: &Vec<GenericParam>,
1983+
params: &Vec<GenericParamAST>,
19841984
add_bounds: &NodeMap<Vec<TyParamBound>>,
19851985
itctx: ImplTraitContext,
19861986
) -> hir::HirVec<hir::GenericParam> {
19871987
params
19881988
.iter()
19891989
.map(|param| match *param {
1990-
GenericParam::Lifetime(ref lifetime_def) => {
1990+
GenericParamAST::Lifetime(ref lifetime_def) => {
19911991
hir::GenericParam::Lifetime(self.lower_lifetime_def(lifetime_def))
19921992
}
1993-
GenericParam::Type(ref ty_param) => hir::GenericParam::Type(self.lower_ty_param(
1993+
GenericParamAST::Type(ref ty_param) => hir::GenericParam::Type(self.lower_ty_param(
19941994
ty_param,
19951995
add_bounds.get(&ty_param.id).map_or(&[][..], |x| &x),
19961996
itctx,
@@ -2030,7 +2030,7 @@ impl<'a> LoweringContext<'a> {
20302030
self.resolver.definitions().as_local_node_id(def_id)
20312031
{
20322032
for param in &g.params {
2033-
if let GenericParam::Type(ref ty_param) = *param {
2033+
if let GenericParamAST::Type(ref ty_param) = *param {
20342034
if node_id == ty_param.id {
20352035
add_bounds
20362036
.entry(ty_param.id)
@@ -2078,7 +2078,7 @@ impl<'a> LoweringContext<'a> {
20782078
}) => {
20792079
self.with_in_scope_lifetime_defs(
20802080
bound_generic_params.iter().filter_map(|p| match p {
2081-
GenericParam::Lifetime(ld) => Some(ld),
2081+
GenericParamAST::Lifetime(ld) => Some(ld),
20822082
_ => None,
20832083
}),
20842084
|this| {
@@ -2397,7 +2397,7 @@ impl<'a> LoweringContext<'a> {
23972397

23982398
let new_impl_items = self.with_in_scope_lifetime_defs(
23992399
ast_generics.params.iter().filter_map(|p| match p {
2400-
GenericParam::Lifetime(ld) => Some(ld),
2400+
GenericParamAST::Lifetime(ld) => Some(ld),
24012401
_ => None,
24022402
}),
24032403
|this| {

‎src/librustc/hir/map/def_collector.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,17 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
170170
}
171171
}
172172

173-
fn visit_generic_param(&mut self, param: &'a GenericParam) {
173+
fn visit_generic_param(&mut self, param: &'a GenericParamAST) {
174174
match *param {
175-
GenericParam::Lifetime(ref lifetime_def) => {
175+
GenericParamAST::Lifetime(ref lifetime_def) => {
176176
self.create_def(
177177
lifetime_def.lifetime.id,
178178
DefPathData::LifetimeDef(lifetime_def.lifetime.ident.name.as_interned_str()),
179179
REGULAR_SPACE,
180180
lifetime_def.lifetime.ident.span
181181
);
182182
}
183-
GenericParam::Type(ref ty_param) => {
183+
GenericParamAST::Type(ref ty_param) => {
184184
self.create_def(
185185
ty_param.id,
186186
DefPathData::TypeParam(ty_param.ident.name.as_interned_str()),

‎src/librustc/lint/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ impl<'a> ast_visit::Visitor<'a> for EarlyContext<'a> {
990990
run_lints!(self, check_expr_post, early_passes, e);
991991
}
992992

993-
fn visit_generic_param(&mut self, param: &'a ast::GenericParam) {
993+
fn visit_generic_param(&mut self, param: &'a ast::GenericParamAST) {
994994
run_lints!(self, check_generic_param, early_passes, param);
995995
ast_visit::walk_generic_param(self, param);
996996
}

‎src/librustc/lint/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ pub trait EarlyLintPass: LintPass {
254254
fn check_expr(&mut self, _: &EarlyContext, _: &ast::Expr) { }
255255
fn check_expr_post(&mut self, _: &EarlyContext, _: &ast::Expr) { }
256256
fn check_ty(&mut self, _: &EarlyContext, _: &ast::Ty) { }
257-
fn check_generic_param(&mut self, _: &EarlyContext, _: &ast::GenericParam) { }
257+
fn check_generic_param(&mut self, _: &EarlyContext, _: &ast::GenericParamAST) { }
258258
fn check_generics(&mut self, _: &EarlyContext, _: &ast::Generics) { }
259259
fn check_where_predicate(&mut self, _: &EarlyContext, _: &ast::WherePredicate) { }
260260
fn check_poly_trait_ref(&mut self, _: &EarlyContext, _: &ast::PolyTraitRef,

‎src/librustc_passes/ast_validation.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ impl<'a> AstValidator<'a> {
138138
}
139139
}
140140

141-
fn check_late_bound_lifetime_defs(&self, params: &Vec<GenericParam>) {
141+
fn check_late_bound_lifetime_defs(&self, params: &Vec<GenericParamAST>) {
142142
// Check: Only lifetime parameters
143143
let non_lifetime_param_spans : Vec<_> = params.iter()
144144
.filter_map(|param| match *param {
145-
GenericParam::Lifetime(_) => None,
146-
GenericParam::Type(ref t) => Some(t.ident.span),
145+
GenericParamAST::Lifetime(_) => None,
146+
GenericParamAST::Type(ref t) => Some(t.ident.span),
147147
}).collect();
148148
if !non_lifetime_param_spans.is_empty() {
149149
self.err_handler().span_err(non_lifetime_param_spans,
@@ -153,14 +153,14 @@ impl<'a> AstValidator<'a> {
153153
// Check: No bounds on lifetime parameters
154154
for param in params.iter() {
155155
match *param {
156-
GenericParam::Lifetime(ref l) => {
156+
GenericParamAST::Lifetime(ref l) => {
157157
if !l.bounds.is_empty() {
158158
let spans: Vec<_> = l.bounds.iter().map(|b| b.ident.span).collect();
159159
self.err_handler().span_err(spans,
160160
"lifetime bounds cannot be used in this context");
161161
}
162162
}
163-
GenericParam::Type(_) => {}
163+
GenericParamAST::Type(_) => {}
164164
}
165165
}
166166
}
@@ -335,7 +335,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
335335
}
336336
ItemKind::TraitAlias(Generics { ref params, .. }, ..) => {
337337
for param in params {
338-
if let GenericParam::Type(TyParam {
338+
if let GenericParamAST::Type(TyParam {
339339
ident,
340340
ref bounds,
341341
ref default,
@@ -414,17 +414,17 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
414414
let mut seen_default = None;
415415
for param in &g.params {
416416
match (param, seen_non_lifetime_param) {
417-
(&GenericParam::Lifetime(ref ld), true) => {
417+
(&GenericParamAST::Lifetime(ref ld), true) => {
418418
self.err_handler()
419419
.span_err(ld.lifetime.ident.span, "lifetime parameters must be leading");
420420
},
421-
(&GenericParam::Lifetime(_), false) => {}
421+
(&GenericParamAST::Lifetime(_), false) => {}
422422
_ => {
423423
seen_non_lifetime_param = true;
424424
}
425425
}
426426

427-
if let GenericParam::Type(ref ty_param @ TyParam { default: Some(_), .. }) = *param {
427+
if let GenericParamAST::Type(ref ty_param @ TyParam { default: Some(_), .. }) = *param {
428428
seen_default = Some(ty_param.ident.span);
429429
} else if let Some(span) = seen_default {
430430
self.err_handler()

‎src/librustc_resolve/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ use syntax::util::lev_distance::find_best_match_for_name;
5656
use syntax::visit::{self, FnKind, Visitor};
5757
use syntax::attr;
5858
use syntax::ast::{Arm, BindingMode, Block, Crate, Expr, ExprKind};
59-
use syntax::ast::{FnDecl, ForeignItem, ForeignItemKind, GenericParam, Generics};
59+
use syntax::ast::{FnDecl, ForeignItem, ForeignItemKind, GenericParamAST, Generics};
6060
use syntax::ast::{Item, ItemKind, ImplItem, ImplItemKind};
6161
use syntax::ast::{Label, Local, Mutability, Pat, PatKind, Path};
6262
use syntax::ast::{QSelf, TraitItemKind, TraitRef, Ty, TyKind};
@@ -798,14 +798,14 @@ impl<'a, 'tcx> Visitor<'tcx> for Resolver<'a> {
798798
// them one by one as they are processed and become available.
799799
let mut default_ban_rib = Rib::new(ForwardTyParamBanRibKind);
800800
default_ban_rib.bindings.extend(generics.params.iter()
801-
.filter_map(|p| if let GenericParam::Type(ref tp) = *p { Some(tp) } else { None })
801+
.filter_map(|p| if let GenericParamAST::Type(ref tp) = *p { Some(tp) } else { None })
802802
.skip_while(|p| p.default.is_none())
803803
.map(|p| (Ident::with_empty_ctxt(p.ident.name), Def::Err)));
804804

805805
for param in &generics.params {
806806
match *param {
807-
GenericParam::Lifetime(_) => self.visit_generic_param(param),
808-
GenericParam::Type(ref ty_param) => {
807+
GenericParamAST::Lifetime(_) => self.visit_generic_param(param),
808+
GenericParamAST::Type(ref ty_param) => {
809809
for bound in &ty_param.bounds {
810810
self.visit_ty_param_bound(bound);
811811
}
@@ -2198,7 +2198,7 @@ impl<'a> Resolver<'a> {
21982198
let mut function_type_rib = Rib::new(rib_kind);
21992199
let mut seen_bindings = FxHashMap();
22002200
for param in &generics.params {
2201-
if let GenericParam::Type(ref type_parameter) = *param {
2201+
if let GenericParamAST::Type(ref type_parameter) = *param {
22022202
let ident = type_parameter.ident.modern();
22032203
debug!("with_type_parameter_rib: {}", type_parameter.id);
22042204

‎src/librustc_save_analysis/dump_visitor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
370370
id: NodeId,
371371
) {
372372
for param in &generics.params {
373-
if let ast::GenericParam::Type(ref ty_param) = *param {
373+
if let ast::GenericParamAST::Type(ref ty_param) = *param {
374374
let param_ss = ty_param.ident.span;
375375
let name = escape(self.span.snippet(param_ss));
376376
// Append $id to name to make sure each one is unique
@@ -1479,7 +1479,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
14791479

14801480
fn visit_generics(&mut self, generics: &'l ast::Generics) {
14811481
for param in &generics.params {
1482-
if let ast::GenericParam::Type(ref ty_param) = *param {
1482+
if let ast::GenericParamAST::Type(ref ty_param) = *param {
14831483
for bound in ty_param.bounds.iter() {
14841484
if let ast::TraitTyParamBound(ref trait_ref, _) = *bound {
14851485
self.process_path(trait_ref.trait_ref.ref_id, &trait_ref.trait_ref.path)

‎src/librustc_save_analysis/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -935,8 +935,8 @@ fn make_signature(decl: &ast::FnDecl, generics: &ast::Generics) -> String {
935935
.params
936936
.iter()
937937
.map(|param| match *param {
938-
ast::GenericParam::Lifetime(ref l) => l.lifetime.ident.name.to_string(),
939-
ast::GenericParam::Type(ref t) => t.ident.to_string(),
938+
ast::GenericParamAST::Lifetime(ref l) => l.lifetime.ident.name.to_string(),
939+
ast::GenericParamAST::Type(ref t) => t.ident.to_string(),
940940
})
941941
.collect::<Vec<_>>()
942942
.join(", "));

‎src/librustc_save_analysis/sig.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ impl Sig for ast::Ty {
224224
text.push_str(&f.generic_params
225225
.iter()
226226
.filter_map(|p| match *p {
227-
ast::GenericParam::Lifetime(ref l) => {
227+
ast::GenericParamAST::Lifetime(ref l) => {
228228
Some(l.lifetime.ident.to_string())
229229
}
230230
_ => None,
@@ -618,7 +618,7 @@ impl Sig for ast::Generics {
618618
let mut defs = vec![];
619619
for param in &self.params {
620620
match *param {
621-
ast::GenericParam::Lifetime(ref l) => {
621+
ast::GenericParamAST::Lifetime(ref l) => {
622622
let mut l_text = l.lifetime.ident.to_string();
623623
defs.push(SigElement {
624624
id: id_from_node_id(l.lifetime.id, scx),
@@ -639,7 +639,7 @@ impl Sig for ast::Generics {
639639
text.push_str(&l_text);
640640
text.push(',');
641641
}
642-
ast::GenericParam::Type(ref t) => {
642+
ast::GenericParamAST::Type(ref t) => {
643643
let mut t_text = t.ident.to_string();
644644
defs.push(SigElement {
645645
id: id_from_node_id(t.id, scx),

‎src/libsyntax/ast.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl GenericArgs {
168168
}
169169

170170
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
171-
pub enum GenericArg {
171+
pub enum GenericArgAST {
172172
Lifetime(Lifetime),
173173
Type(P<Ty>),
174174
}
@@ -179,7 +179,7 @@ pub struct AngleBracketedArgs {
179179
/// Overall span
180180
pub span: Span,
181181
/// The arguments for this path segment.
182-
pub args: Vec<GenericArg>,
182+
pub args: Vec<GenericArgAST>,
183183
/// Bindings (equality constraints) on associated types, if present.
184184
///
185185
/// E.g., `Foo<A=Bar>`.
@@ -189,7 +189,7 @@ pub struct AngleBracketedArgs {
189189
impl AngleBracketedArgs {
190190
pub fn lifetimes(&self) -> impl DoubleEndedIterator<Item = &Lifetime> {
191191
self.args.iter().filter_map(|arg| {
192-
if let GenericArg::Lifetime(lt) = arg {
192+
if let GenericArgAST::Lifetime(lt) = arg {
193193
Some(lt)
194194
} else {
195195
None
@@ -199,7 +199,7 @@ impl AngleBracketedArgs {
199199

200200
pub fn types(&self) -> impl DoubleEndedIterator<Item = &P<Ty>> {
201201
self.args.iter().filter_map(|arg| {
202-
if let GenericArg::Type(ty) = arg {
202+
if let GenericArgAST::Type(ty) = arg {
203203
Some(ty)
204204
} else {
205205
None
@@ -338,22 +338,22 @@ pub struct TyParam {
338338
}
339339

340340
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
341-
pub enum GenericParam {
341+
pub enum GenericParamAST {
342342
Lifetime(LifetimeDef),
343343
Type(TyParam),
344344
}
345345

346-
impl GenericParam {
346+
impl GenericParamAST {
347347
pub fn is_lifetime_param(&self) -> bool {
348348
match *self {
349-
GenericParam::Lifetime(_) => true,
349+
GenericParamAST::Lifetime(_) => true,
350350
_ => false,
351351
}
352352
}
353353

354354
pub fn is_type_param(&self) -> bool {
355355
match *self {
356-
GenericParam::Type(_) => true,
356+
GenericParamAST::Type(_) => true,
357357
_ => false,
358358
}
359359
}
@@ -363,7 +363,7 @@ impl GenericParam {
363363
/// a function, enum, trait, etc.
364364
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
365365
pub struct Generics {
366-
pub params: Vec<GenericParam>,
366+
pub params: Vec<GenericParamAST>,
367367
pub where_clause: WhereClause,
368368
pub span: Span,
369369
}
@@ -383,7 +383,7 @@ impl Generics {
383383

384384
pub fn span_for_name(&self, name: &str) -> Option<Span> {
385385
for param in &self.params {
386-
if let GenericParam::Type(ref t) = *param {
386+
if let GenericParamAST::Type(ref t) = *param {
387387
if t.ident.name == name {
388388
return Some(t.ident.span);
389389
}
@@ -444,7 +444,7 @@ impl WherePredicate {
444444
pub struct WhereBoundPredicate {
445445
pub span: Span,
446446
/// Any generics from a `for` binding
447-
pub bound_generic_params: Vec<GenericParam>,
447+
pub bound_generic_params: Vec<GenericParamAST>,
448448
/// The type being bounded
449449
pub bounded_ty: P<Ty>,
450450
/// Trait and lifetime bounds (`Clone+Send+'static`)
@@ -1576,7 +1576,7 @@ impl fmt::Debug for Ty {
15761576
pub struct BareFnTy {
15771577
pub unsafety: Unsafety,
15781578
pub abi: Abi,
1579-
pub generic_params: Vec<GenericParam>,
1579+
pub generic_params: Vec<GenericParamAST>,
15801580
pub decl: P<FnDecl>
15811581
}
15821582

@@ -1955,7 +1955,7 @@ pub struct TraitRef {
19551955
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
19561956
pub struct PolyTraitRef {
19571957
/// The `'a` in `<'a> Foo<&'a T>`
1958-
pub bound_generic_params: Vec<GenericParam>,
1958+
pub bound_generic_params: Vec<GenericParamAST>,
19591959

19601960
/// The `Foo<&'a T>` in `<'a> Foo<&'a T>`
19611961
pub trait_ref: TraitRef,
@@ -1964,7 +1964,7 @@ pub struct PolyTraitRef {
19641964
}
19651965

19661966
impl PolyTraitRef {
1967-
pub fn new(generic_params: Vec<GenericParam>, path: Path, span: Span) -> Self {
1967+
pub fn new(generic_params: Vec<GenericParamAST>, path: Path, span: Span) -> Self {
19681968
PolyTraitRef {
19691969
bound_generic_params: generic_params,
19701970
trait_ref: TraitRef { path: path, ref_id: DUMMY_NODE_ID },

0 commit comments

Comments
 (0)