Skip to content

Commit 76c0d68

Browse files
varkorvarkor
committed
Rename "parameter" to "arg"
1 parent 3e89753 commit 76c0d68

File tree

35 files changed

+242
-355
lines changed

35 files changed

+242
-355
lines changed

‎src/librustc/hir/intravisit.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -648,15 +648,15 @@ pub fn walk_path_segment<'v, V: Visitor<'v>>(visitor: &mut V,
648648
path_span: Span,
649649
segment: &'v PathSegment) {
650650
visitor.visit_name(path_span, segment.name);
651-
if let Some(ref parameters) = segment.parameters {
652-
visitor.visit_generic_args(path_span, parameters);
651+
if let Some(ref args) = segment.args {
652+
visitor.visit_generic_args(path_span, args);
653653
}
654654
}
655655

656656
pub fn walk_generic_args<'v, V: Visitor<'v>>(visitor: &mut V,
657657
_path_span: Span,
658658
generic_args: &'v GenericArgs) {
659-
walk_list!(visitor, visit_generic_arg, &generic_args.parameters);
659+
walk_list!(visitor, visit_generic_arg, &generic_args.args);
660660
walk_list!(visitor, visit_assoc_type_binding, &generic_args.bindings);
661661
}
662662

‎src/librustc/hir/lowering.rs

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ use std::fmt::Debug;
5959
use std::iter;
6060
use std::mem;
6161
use syntax::attr;
62+
use syntax::ast;
6263
use syntax::ast::*;
6364
use syntax::errors;
6465
use syntax::ext::hygiene::{Mark, SyntaxContext};
@@ -1039,14 +1040,14 @@ impl<'a> LoweringContext<'a> {
10391040
}
10401041

10411042
fn lower_generic_arg(&mut self,
1042-
p: &AngleBracketedParam,
1043+
p: &ast::GenericArg,
10431044
itctx: ImplTraitContext)
1044-
-> GenericArg {
1045+
-> hir::GenericArg {
10451046
match p {
1046-
AngleBracketedParam::Lifetime(lt) => {
1047+
ast::GenericArg::Lifetime(lt) => {
10471048
GenericArg::Lifetime(self.lower_lifetime(&lt))
10481049
}
1049-
AngleBracketedParam::Type(ty) => {
1050+
ast::GenericArg::Type(ty) => {
10501051
GenericArg::Type(self.lower_ty(&ty, itctx))
10511052
}
10521053
}
@@ -1684,8 +1685,7 @@ impl<'a> LoweringContext<'a> {
16841685
parenthesized_generic_args: ParenthesizedGenericArgs,
16851686
itctx: ImplTraitContext,
16861687
) -> hir::PathSegment {
1687-
let (mut generic_args, infer_types) =
1688-
if let Some(ref generic_args) = segment.parameters {
1688+
let (mut generic_args, infer_types) = if let Some(ref generic_args) = segment.args {
16891689
let msg = "parenthesized parameters may only be used with a trait";
16901690
match **generic_args {
16911691
GenericArgs::AngleBracketed(ref data) => {
@@ -1715,27 +1715,30 @@ impl<'a> LoweringContext<'a> {
17151715
};
17161716

17171717
if !generic_args.parenthesized && generic_args.lifetimes().count() == 0 {
1718-
generic_args.parameters = (0..expected_lifetimes).map(|_| {
1719-
GenericArg::Lifetime(self.elided_lifetime(path_span))
1720-
}).chain(generic_args.parameters.into_iter()).collect();
1718+
generic_args.args =
1719+
self.elided_path_lifetimes(path_span, expected_lifetimes)
1720+
.into_iter()
1721+
.map(|lt| GenericArg::Lifetime(lt))
1722+
.chain(generic_args.args.into_iter())
1723+
.collect();
17211724
}
17221725

17231726
hir::PathSegment::new(
1724-
self.lower_ident(segment.identifier),
1727+
self.lower_ident(segment.ident),
17251728
generic_args,
17261729
infer_types
17271730
)
17281731
}
17291732

17301733
fn lower_angle_bracketed_parameter_data(
17311734
&mut self,
1732-
data: &AngleBracketedParameterData,
1735+
data: &AngleBracketedArgs,
17331736
param_mode: ParamMode,
17341737
itctx: ImplTraitContext,
17351738
) -> (hir::GenericArgs, bool) {
1736-
let &AngleBracketedParameterData { ref parameters, ref bindings, .. } = data;
1739+
let &AngleBracketedArgs { ref args, ref bindings, .. } = data;
17371740
(hir::GenericArgs {
1738-
parameters: parameters.iter().map(|p| self.lower_generic_arg(p, itctx)).collect(),
1741+
args: args.iter().map(|p| self.lower_generic_arg(p, itctx)).collect(),
17391742
bindings: bindings.iter().map(|b| self.lower_ty_binding(b, itctx)).collect(),
17401743
parenthesized: false,
17411744
},
@@ -1755,23 +1758,11 @@ impl<'a> LoweringContext<'a> {
17551758
AnonymousLifetimeMode::PassThrough,
17561759
|this| {
17571760
const DISALLOWED: ImplTraitContext = ImplTraitContext::Disallowed;
1758-
let &ParenthesizedParameterData {
1759-
ref inputs,
1760-
ref output,
1761-
span,
1762-
} = data;
1763-
let inputs = inputs
1764-
.iter()
1765-
.map(|ty| this.lower_ty(ty, DISALLOWED))
1766-
.collect();
1761+
let &ParenthesizedParameterData { ref inputs, ref output, span } = data;
1762+
let inputs = inputs.iter().map(|ty| this.lower_ty(ty, DISALLOWED)).collect();
17671763
let mk_tup = |this: &mut Self, tys, span| {
17681764
let LoweredNodeId { node_id, hir_id } = this.next_id();
1769-
P(hir::Ty {
1770-
node: hir::TyTup(tys),
1771-
id: node_id,
1772-
hir_id,
1773-
span,
1774-
})
1765+
P(hir::Ty { node: hir::TyTup(tys), id: node_id, hir_id, span })
17751766
};
17761767

17771768
(

‎src/librustc/hir/mod.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ pub struct PathSegment {
327327
/// this is more than just simple syntactic sugar; the use of
328328
/// parens affects the region binding rules, so we preserve the
329329
/// distinction.
330-
pub parameters: Option<P<GenericArgs>>,
330+
pub args: Option<P<GenericArgs>>,
331331

332332
/// Whether to infer remaining type parameters, if any.
333333
/// This only applies to expression and pattern paths, and
@@ -342,30 +342,30 @@ impl PathSegment {
342342
PathSegment {
343343
name,
344344
infer_types: true,
345-
parameters: None
345+
args: None,
346346
}
347347
}
348348

349-
pub fn new(name: Name, parameters: GenericArgs, infer_types: bool) -> Self {
349+
pub fn new(name: Name, args: GenericArgs, infer_types: bool) -> Self {
350350
PathSegment {
351351
name,
352352
infer_types,
353-
parameters: if parameters.is_empty() {
353+
args: if args.is_empty() {
354354
None
355355
} else {
356-
Some(P(parameters))
356+
Some(P(args))
357357
}
358358
}
359359
}
360360

361361
// FIXME: hack required because you can't create a static
362362
// GenericArgs, so you can't just return a &GenericArgs.
363-
pub fn with_parameters<F, R>(&self, f: F) -> R
363+
pub fn with_args<F, R>(&self, f: F) -> R
364364
where F: FnOnce(&GenericArgs) -> R
365365
{
366366
let dummy = GenericArgs::none();
367-
f(if let Some(ref params) = self.parameters {
368-
&params
367+
f(if let Some(ref args) = self.args {
368+
&args
369369
} else {
370370
&dummy
371371
})
@@ -380,12 +380,12 @@ pub enum GenericArg {
380380

381381
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
382382
pub struct GenericArgs {
383-
/// The generic parameters for this path segment.
384-
pub parameters: HirVec<GenericArg>,
383+
/// The generic arguments for this path segment.
384+
pub args: HirVec<GenericArg>,
385385
/// Bindings (equality constraints) on associated types, if present.
386386
/// E.g., `Foo<A=Bar>`.
387387
pub bindings: HirVec<TypeBinding>,
388-
/// Were parameters written in parenthesized form `Fn(T) -> U`?
388+
/// Were arguments written in parenthesized form `Fn(T) -> U`?
389389
/// This is required mostly for pretty-printing and diagnostics,
390390
/// but also for changing lifetime elision rules to be "function-like".
391391
pub parenthesized: bool,
@@ -394,14 +394,14 @@ pub struct GenericArgs {
394394
impl GenericArgs {
395395
pub fn none() -> Self {
396396
Self {
397-
parameters: HirVec::new(),
397+
args: HirVec::new(),
398398
bindings: HirVec::new(),
399399
parenthesized: false,
400400
}
401401
}
402402

403403
pub fn is_empty(&self) -> bool {
404-
self.parameters.is_empty() && self.bindings.is_empty() && !self.parenthesized
404+
self.args.is_empty() && self.bindings.is_empty() && !self.parenthesized
405405
}
406406

407407
pub fn inputs(&self) -> &[P<Ty>] {
@@ -416,7 +416,7 @@ impl GenericArgs {
416416
}
417417

418418
pub fn lifetimes(&self) -> impl DoubleEndedIterator<Item = &Lifetime> {
419-
self.parameters.iter().filter_map(|p| {
419+
self.args.iter().filter_map(|p| {
420420
if let GenericArg::Lifetime(lt) = p {
421421
Some(lt)
422422
} else {
@@ -426,7 +426,7 @@ impl GenericArgs {
426426
}
427427

428428
pub fn types(&self) -> impl DoubleEndedIterator<Item = &P<Ty>> {
429-
self.parameters.iter().filter_map(|p| {
429+
self.args.iter().filter_map(|p| {
430430
if let GenericArg::Type(ty) = p {
431431
Some(ty)
432432
} else {

‎src/librustc/hir/print.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,11 +1269,11 @@ impl<'a> State<'a> {
12691269
self.s.word(".")?;
12701270
self.print_name(segment.name)?;
12711271

1272-
segment.with_parameters(|parameters| {
1273-
if !parameters.parameters.is_empty() ||
1274-
!parameters.bindings.is_empty()
1272+
segment.with_args(|args| {
1273+
if !args.args.is_empty() ||
1274+
!args.bindings.is_empty()
12751275
{
1276-
self.print_generic_args(&parameters, segment.infer_types, true)
1276+
self.print_generic_args(&args, segment.infer_types, true)
12771277
} else {
12781278
Ok(())
12791279
}
@@ -1641,7 +1641,7 @@ impl<'a> State<'a> {
16411641
if segment.name != keywords::CrateRoot.name() &&
16421642
segment.name != keywords::DollarCrate.name() {
16431643
self.print_name(segment.name)?;
1644-
segment.with_parameters(|parameters| {
1644+
segment.with_args(|parameters| {
16451645
self.print_generic_args(parameters,
16461646
segment.infer_types,
16471647
colons_before_params)
@@ -1673,7 +1673,7 @@ impl<'a> State<'a> {
16731673
if segment.name != keywords::CrateRoot.name() &&
16741674
segment.name != keywords::DollarCrate.name() {
16751675
self.print_name(segment.name)?;
1676-
segment.with_parameters(|parameters| {
1676+
segment.with_args(|parameters| {
16771677
self.print_generic_args(parameters,
16781678
segment.infer_types,
16791679
colons_before_params)
@@ -1685,7 +1685,7 @@ impl<'a> State<'a> {
16851685
self.s.word("::")?;
16861686
let item_segment = path.segments.last().unwrap();
16871687
self.print_name(item_segment.name)?;
1688-
item_segment.with_parameters(|parameters| {
1688+
item_segment.with_args(|parameters| {
16891689
self.print_generic_args(parameters,
16901690
item_segment.infer_types,
16911691
colons_before_params)
@@ -1697,7 +1697,7 @@ impl<'a> State<'a> {
16971697
self.s.word(">")?;
16981698
self.s.word("::")?;
16991699
self.print_name(item_segment.name)?;
1700-
item_segment.with_parameters(|parameters| {
1700+
item_segment.with_args(|parameters| {
17011701
self.print_generic_args(parameters,
17021702
item_segment.infer_types,
17031703
colons_before_params)
@@ -1734,7 +1734,7 @@ impl<'a> State<'a> {
17341734
let elide_lifetimes = generic_args.lifetimes().all(|lt| lt.is_elided());
17351735
if !elide_lifetimes {
17361736
start_or_comma(self)?;
1737-
self.commasep(Inconsistent, &generic_args.parameters, |s, p| {
1737+
self.commasep(Inconsistent, &generic_args.args, |s, p| {
17381738
match p {
17391739
GenericArg::Lifetime(lt) => s.print_lifetime(lt),
17401740
GenericArg::Type(ty) => s.print_type(ty),

‎src/librustc/ich/impls_hir.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ impl_stable_hash_for!(struct hir::Path {
177177
impl_stable_hash_for!(struct hir::PathSegment {
178178
name,
179179
infer_types,
180-
parameters
180+
args
181181
});
182182

183183
impl_stable_hash_for!(enum hir::GenericArg {
@@ -186,7 +186,7 @@ impl_stable_hash_for!(enum hir::GenericArg {
186186
});
187187

188188
impl_stable_hash_for!(struct hir::GenericArgs {
189-
parameters,
189+
args,
190190
bindings,
191191
parenthesized
192192
});

‎src/librustc/middle/resolve_lifetime.rs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ use rustc_data_structures::sync::Lrc;
2828
use session::Session;
2929
use std::cell::Cell;
3030
use std::mem::replace;
31-
use std::slice;
3231
use syntax::ast;
3332
use syntax::attr;
3433
use syntax::ptr::P;
@@ -155,11 +154,10 @@ impl Region {
155154
}
156155
}
157156

158-
fn subst(self, params: Vec<&hir::Lifetime>, map: &NamedRegionMap) -> Option<Region> {
157+
fn subst<'a, L>(self, mut params: L, map: &NamedRegionMap) -> Option<Region>
158+
where L: Iterator<Item = &'a hir::Lifetime> {
159159
if let Region::EarlyBound(index, _, _) = self {
160-
params
161-
.get(index as usize)
162-
.and_then(|lifetime| map.defs.get(&lifetime.id).cloned())
160+
params.nth(index as usize).and_then(|lifetime| map.defs.get(&lifetime.id).cloned())
163161
} else {
164162
Some(self)
165163
}
@@ -603,7 +601,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
603601
// resolved the same as the `'_` in `&'_ Foo`.
604602
//
605603
// cc #48468
606-
self.resolve_elided_lifetimes(slice::from_ref(lifetime), false)
604+
self.resolve_elided_lifetimes(vec![lifetime], false)
607605
}
608606
LifetimeName::Fresh(_) | LifetimeName::Static | LifetimeName::Name(_) => {
609607
// If the user wrote an explicit name, use that.
@@ -833,8 +831,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
833831
fn visit_path(&mut self, path: &'tcx hir::Path, _: ast::NodeId) {
834832
for (i, segment) in path.segments.iter().enumerate() {
835833
let depth = path.segments.len() - i - 1;
836-
if let Some(ref parameters) = segment.parameters {
837-
self.visit_segment_parameters(path.def, depth, parameters);
834+
if let Some(ref args) = segment.args {
835+
self.visit_segment_args(path.def, depth, args);
838836
}
839837
}
840838
}
@@ -1599,24 +1597,24 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
15991597
}
16001598
}
16011599

1602-
fn visit_segment_parameters(
1600+
fn visit_segment_args(
16031601
&mut self,
16041602
def: Def,
16051603
depth: usize,
1606-
params: &'tcx hir::GenericArgs,
1604+
args: &'tcx hir::GenericArgs,
16071605
) {
1608-
if params.parenthesized {
1606+
if args.parenthesized {
16091607
let was_in_fn_syntax = self.is_in_fn_syntax;
16101608
self.is_in_fn_syntax = true;
1611-
self.visit_fn_like_elision(params.inputs(), Some(&params.bindings[0].ty));
1609+
self.visit_fn_like_elision(args.inputs(), Some(&args.bindings[0].ty));
16121610
self.is_in_fn_syntax = was_in_fn_syntax;
16131611
return;
16141612
}
16151613

1616-
if params.lifetimes().all(|l| l.is_elided()) {
1617-
self.resolve_elided_lifetimes(params.lifetimes().collect(), true);
1614+
if args.lifetimes().all(|l| l.is_elided()) {
1615+
self.resolve_elided_lifetimes(args.lifetimes().collect(), true);
16181616
} else {
1619-
for l in params.lifetimes() {
1617+
for l in args.lifetimes() {
16201618
self.visit_lifetime(l);
16211619
}
16221620
}
@@ -1688,13 +1686,13 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
16881686
} else {
16891687
Some(Region::Static)
16901688
},
1691-
Set1::One(r) => r.subst(params.lifetimes().collect(), map),
1689+
Set1::One(r) => r.subst(args.lifetimes(), map),
16921690
Set1::Many => None,
16931691
})
16941692
.collect()
16951693
});
16961694

1697-
for (i, ty) in params.types().enumerate() {
1695+
for (i, ty) in args.types().enumerate() {
16981696
if let Some(&lt) = object_lifetime_defaults.get(i) {
16991697
let scope = Scope::ObjectLifetimeDefault {
17001698
lifetime: lt,
@@ -1706,7 +1704,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
17061704
}
17071705
}
17081706

1709-
for b in &params.bindings {
1707+
for b in &args.bindings {
17101708
self.visit_assoc_type_binding(b);
17111709
}
17121710
}

0 commit comments

Comments
 (0)