Skip to content

Commit 3bcb006

Browse files
varkorvarkor
committed
Rename structures in ast
1 parent f457b3d commit 3bcb006

File tree

23 files changed

+136
-136
lines changed

23 files changed

+136
-136
lines changed

‎src/librustc/hir/lowering.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ impl<'a> LoweringContext<'a> {
325325
.params
326326
.iter()
327327
.filter(|param| match param.kind {
328-
ast::GenericParamKindAST::Lifetime { .. } => true,
328+
ast::GenericParamKind::Lifetime { .. } => true,
329329
_ => false,
330330
})
331331
.count();
@@ -758,13 +758,13 @@ impl<'a> LoweringContext<'a> {
758758
// This is used to track which lifetimes have already been defined, and
759759
// which are new in-band lifetimes that need to have a definition created
760760
// for them.
761-
fn with_in_scope_lifetime_defs<T, F>(&mut self, params: &Vec<GenericParamAST>, f: F) -> T
761+
fn with_in_scope_lifetime_defs<T, F>(&mut self, params: &Vec<GenericParam>, f: F) -> T
762762
where
763763
F: FnOnce(&mut LoweringContext) -> T,
764764
{
765765
let old_len = self.in_scope_lifetimes.len();
766766
let lt_def_names = params.iter().filter_map(|param| match param.kind {
767-
GenericParamKindAST::Lifetime { .. } => Some(param.ident.name),
767+
GenericParamKind::Lifetime { .. } => Some(param.ident.name),
768768
_ => None,
769769
});
770770
self.in_scope_lifetimes.extend(lt_def_names);
@@ -1044,12 +1044,12 @@ impl<'a> LoweringContext<'a> {
10441044
}
10451045

10461046
fn lower_generic_arg(&mut self,
1047-
arg: &ast::GenericArgAST,
1047+
arg: &ast::GenericArg,
10481048
itctx: ImplTraitContext)
10491049
-> hir::GenericArg {
10501050
match arg {
1051-
ast::GenericArgAST::Lifetime(lt) => GenericArg::Lifetime(self.lower_lifetime(&lt)),
1052-
ast::GenericArgAST::Type(ty) => GenericArg::Type(self.lower_ty(&ty, itctx)),
1051+
ast::GenericArg::Lifetime(lt) => GenericArg::Lifetime(self.lower_lifetime(&lt)),
1052+
ast::GenericArg::Type(ty) => GenericArg::Type(self.lower_ty(&ty, itctx)),
10531053
}
10541054
}
10551055

@@ -1745,7 +1745,7 @@ impl<'a> LoweringContext<'a> {
17451745
) -> (hir::GenericArgs, bool) {
17461746
let &AngleBracketedArgs { ref args, ref bindings, .. } = data;
17471747
let has_types = args.iter().any(|arg| match arg {
1748-
GenericArgAST::Type(_) => true,
1748+
ast::GenericArg::Type(_) => true,
17491749
_ => false,
17501750
});
17511751
(hir::GenericArgs {
@@ -1934,20 +1934,20 @@ impl<'a> LoweringContext<'a> {
19341934

19351935
fn lower_generic_params(
19361936
&mut self,
1937-
params: &Vec<GenericParamAST>,
1937+
params: &Vec<GenericParam>,
19381938
add_bounds: &NodeMap<Vec<TyParamBound>>,
19391939
itctx: ImplTraitContext,
19401940
) -> hir::HirVec<hir::GenericParam> {
19411941
params.iter().map(|param| self.lower_generic_param(param, add_bounds, itctx)).collect()
19421942
}
19431943

19441944
fn lower_generic_param(&mut self,
1945-
param: &GenericParamAST,
1945+
param: &GenericParam,
19461946
add_bounds: &NodeMap<Vec<TyParamBound>>,
19471947
itctx: ImplTraitContext)
19481948
-> hir::GenericParam {
19491949
match param.kind {
1950-
GenericParamKindAST::Lifetime { ref bounds, ref lifetime, .. } => {
1950+
GenericParamKind::Lifetime { ref bounds, ref lifetime, .. } => {
19511951
let was_collecting_in_band = self.is_collecting_in_band_lifetimes;
19521952
self.is_collecting_in_band_lifetimes = false;
19531953

@@ -1968,7 +1968,7 @@ impl<'a> LoweringContext<'a> {
19681968

19691969
param
19701970
}
1971-
GenericParamKindAST::Type { ref bounds, ref default } => {
1971+
GenericParamKind::Type { ref bounds, ref default } => {
19721972
let mut name = self.lower_ident(param.ident);
19731973

19741974
// Don't expose `Self` (recovered "keyword used as ident" parse error).
@@ -2044,7 +2044,7 @@ impl<'a> LoweringContext<'a> {
20442044
{
20452045
for param in &generics.params {
20462046
match param.kind {
2047-
GenericParamKindAST::Type { .. } => {
2047+
GenericParamKind::Type { .. } => {
20482048
if node_id == param.id {
20492049
add_bounds.entry(param.id)
20502050
.or_insert(Vec::new())

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

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

173-
fn visit_generic_param(&mut self, param: &'a GenericParamAST) {
173+
fn visit_generic_param(&mut self, param: &'a GenericParam) {
174174
let name = param.ident.name.as_interned_str();
175175
let def_path_data = match param.kind {
176-
GenericParamKindAST::Lifetime { .. } => DefPathData::LifetimeParam(name),
177-
GenericParamKindAST::Type { .. } => DefPathData::TypeParam(name),
176+
GenericParamKind::Lifetime { .. } => DefPathData::LifetimeParam(name),
177+
GenericParamKind::Type { .. } => DefPathData::TypeParam(name),
178178
};
179179
self.create_def(param.id, def_path_data, REGULAR_SPACE, param.ident.span);
180180

‎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::GenericParamAST) {
993+
fn visit_generic_param(&mut self, param: &'a ast::GenericParam) {
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::GenericParamAST) { }
257+
fn check_generic_param(&mut self, _: &EarlyContext, _: &ast::GenericParam) { }
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_driver/pretty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ impl<'a> ReplaceBodyWithLoop<'a> {
681681
None => false,
682682
Some(&ast::GenericArgs::AngleBracketed(ref data)) => {
683683
let types = data.args.iter().filter_map(|arg| match arg {
684-
ast::GenericArgAST::Type(ty) => Some(ty),
684+
ast::GenericArg::Type(ty) => Some(ty),
685685
_ => None,
686686
});
687687
any_involves_impl_trait(types.into_iter()) ||

‎src/librustc_passes/ast_validation.rs

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

141-
fn check_late_bound_lifetime_defs(&self, params: &Vec<GenericParamAST>) {
141+
fn check_late_bound_lifetime_defs(&self, params: &Vec<GenericParam>) {
142142
// Check only lifetime parameters are present and that the lifetime
143143
// parameters that are present have no bounds.
144144
let non_lt_param_spans: Vec<_> = params.iter().filter_map(|param| match param.kind {
145-
GenericParamKindAST::Lifetime { ref bounds, .. } => {
145+
GenericParamKind::Lifetime { ref bounds, .. } => {
146146
if !bounds.is_empty() {
147147
let spans: Vec<_> = bounds.iter().map(|b| b.ident.span).collect();
148148
self.err_handler()
@@ -329,8 +329,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
329329
ItemKind::TraitAlias(Generics { ref params, .. }, ..) => {
330330
for param in params {
331331
match param.kind {
332-
GenericParamKindAST::Lifetime { .. } => {}
333-
GenericParamKindAST::Type { ref bounds, ref default, .. } => {
332+
GenericParamKind::Lifetime { .. } => {}
333+
GenericParamKind::Type { ref bounds, ref default, .. } => {
334334
if !bounds.is_empty() {
335335
self.err_handler()
336336
.span_err(param.ident.span, "type parameters on the left \
@@ -404,12 +404,12 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
404404
let mut seen_default = None;
405405
for param in &generics.params {
406406
match (&param.kind, seen_non_lifetime_param) {
407-
(GenericParamKindAST::Lifetime { .. }, true) => {
407+
(GenericParamKind::Lifetime { .. }, true) => {
408408
self.err_handler()
409409
.span_err(param.ident.span, "lifetime parameters must be leading");
410410
},
411-
(GenericParamKindAST::Lifetime { .. }, false) => {}
412-
(GenericParamKindAST::Type { ref default, .. }, _) => {
411+
(GenericParamKind::Lifetime { .. }, false) => {}
412+
(GenericParamKind::Type { ref default, .. }, _) => {
413413
seen_non_lifetime_param = true;
414414
if default.is_some() {
415415
seen_default = Some(param.ident.span);
@@ -514,7 +514,7 @@ impl<'a> Visitor<'a> for NestedImplTraitVisitor<'a> {
514514
match *generic_args {
515515
GenericArgs::AngleBracketed(ref data) => {
516516
data.args.iter().for_each(|arg| match arg {
517-
GenericArgAST::Type(ty) => self.visit_ty(ty),
517+
GenericArg::Type(ty) => self.visit_ty(ty),
518518
_ => {}
519519
});
520520
for type_binding in &data.bindings {

‎src/librustc_resolve/lib.rs

Lines changed: 6 additions & 6 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, GenericParamKindAST, Generics};
59+
use syntax::ast::{FnDecl, ForeignItem, ForeignItemKind, GenericParamKind, 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};
@@ -800,8 +800,8 @@ impl<'a, 'tcx> Visitor<'tcx> for Resolver<'a> {
800800
let mut found_default = false;
801801
default_ban_rib.bindings.extend(generics.params.iter()
802802
.filter_map(|param| match param.kind {
803-
GenericParamKindAST::Lifetime { .. } => None,
804-
GenericParamKindAST::Type { ref default, .. } => {
803+
GenericParamKind::Lifetime { .. } => None,
804+
GenericParamKind::Type { ref default, .. } => {
805805
if found_default || default.is_some() {
806806
found_default = true;
807807
return Some((Ident::with_empty_ctxt(param.ident.name), Def::Err));
@@ -812,8 +812,8 @@ impl<'a, 'tcx> Visitor<'tcx> for Resolver<'a> {
812812

813813
for param in &generics.params {
814814
match param.kind {
815-
GenericParamKindAST::Lifetime { .. } => self.visit_generic_param(param),
816-
GenericParamKindAST::Type { ref bounds, ref default, .. } => {
815+
GenericParamKind::Lifetime { .. } => self.visit_generic_param(param),
816+
GenericParamKind::Type { ref bounds, ref default, .. } => {
817817
for bound in bounds {
818818
self.visit_ty_param_bound(bound);
819819
}
@@ -2208,7 +2208,7 @@ impl<'a> Resolver<'a> {
22082208
let mut function_type_rib = Rib::new(rib_kind);
22092209
let mut seen_bindings = FxHashMap();
22102210
generics.params.iter().for_each(|param| match param.kind {
2211-
GenericParamKindAST::Type { .. } => {
2211+
GenericParamKind::Type { .. } => {
22122212
let ident = param.ident.modern();
22132213
debug!("with_type_parameter_rib: {}", param.id);
22142214

‎src/librustc_save_analysis/dump_visitor.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
371371
) {
372372
for param in &generics.params {
373373
match param.kind {
374-
ast::GenericParamKindAST::Lifetime { .. } => {}
375-
ast::GenericParamKindAST::Type { .. } => {
374+
ast::GenericParamKind::Lifetime { .. } => {}
375+
ast::GenericParamKind::Type { .. } => {
376376
let param_ss = param.ident.span;
377377
let name = escape(self.span.snippet(param_ss));
378378
// Append $id to name to make sure each one is unique.
@@ -827,7 +827,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
827827
match **generic_args {
828828
ast::GenericArgs::AngleBracketed(ref data) => {
829829
data.args.iter().for_each(|arg| match arg {
830-
ast::GenericArgAST::Type(ty) => self.visit_ty(ty),
830+
ast::GenericArg::Type(ty) => self.visit_ty(ty),
831831
_ => {}
832832
});
833833
}
@@ -914,7 +914,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
914914
if let Some(ref generic_args) = seg.args {
915915
if let ast::GenericArgs::AngleBracketed(ref data) = **generic_args {
916916
data.args.iter().for_each(|arg| match arg {
917-
ast::GenericArgAST::Type(ty) => self.visit_ty(ty),
917+
ast::GenericArg::Type(ty) => self.visit_ty(ty),
918918
_ => {}
919919
});
920920
}
@@ -1486,8 +1486,8 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
14861486

14871487
fn visit_generics(&mut self, generics: &'l ast::Generics) {
14881488
generics.params.iter().for_each(|param| match param.kind {
1489-
ast::GenericParamKindAST::Lifetime { .. } => {}
1490-
ast::GenericParamKindAST::Type { ref bounds, ref default, .. } => {
1489+
ast::GenericParamKind::Lifetime { .. } => {}
1490+
ast::GenericParamKind::Type { ref bounds, ref default, .. } => {
14911491
for bound in bounds {
14921492
if let ast::TraitTyParamBound(ref trait_ref, _) = *bound {
14931493
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.kind {
938-
ast::GenericParamKindAST::Lifetime { .. } => param.ident.name.to_string(),
939-
ast::GenericParamKindAST::Type { .. } => param.ident.to_string(),
938+
ast::GenericParamKind::Lifetime { .. } => param.ident.name.to_string(),
939+
ast::GenericParamKind::Type { .. } => param.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(|param| match param.kind {
227-
ast::GenericParamKindAST::Lifetime { .. } => {
227+
ast::GenericParamKind::Lifetime { .. } => {
228228
Some(param.ident.to_string())
229229
}
230230
_ => None,
@@ -624,7 +624,7 @@ impl Sig for ast::Generics {
624624
end: offset + text.len() + param_text.len(),
625625
});
626626
match param.kind {
627-
ast::GenericParamKindAST::Lifetime { ref bounds, .. } => {
627+
ast::GenericParamKind::Lifetime { ref bounds, .. } => {
628628
if !bounds.is_empty() {
629629
param_text.push_str(": ");
630630
let bounds = bounds.iter()
@@ -635,7 +635,7 @@ impl Sig for ast::Generics {
635635
// FIXME add lifetime bounds refs.
636636
}
637637
}
638-
ast::GenericParamKindAST::Type { ref bounds, .. } => {
638+
ast::GenericParamKind::Type { ref bounds, .. } => {
639639
if !bounds.is_empty() {
640640
param_text.push_str(": ");
641641
param_text.push_str(&pprust::bounds_to_string(bounds));

0 commit comments

Comments
 (0)