@@ -139,22 +139,22 @@ fn generic_arg_mismatch_err(
139139 err. emit ( )
140140}
141141
142- /// Creates the relevant generic argument substitutions
142+ /// Creates the relevant generic arguments
143143/// corresponding to a set of generic parameters. This is a
144144/// rather complex function. Let us try to explain the role
145145/// of each of its parameters:
146146///
147- /// To start, we are given the `def_id` of the thing we are
148- /// creating the substitutions for , and a partial set of
149- /// substitutions `parent_args`. In general, the substitutions
150- /// for an item begin with substitutions for all the "parents" of
147+ /// To start, we are given the `def_id` of the thing whose generic
148+ /// parameters we are instantiating , and a partial set of
149+ /// arguments `parent_args`. In general, the generic arguments
150+ /// for an item begin with arguments for all the "parents" of
151151/// that item -- e.g., for a method it might include the
152152/// parameters from the impl.
153153///
154154/// Therefore, the method begins by walking down these parents,
155155/// starting with the outermost parent and proceed inwards until
156156/// it reaches `def_id`. For each parent `P`, it will check `parent_args`
157- /// first to see if the parent's substitutions are listed in there. If so,
157+ /// first to see if the parent's arguments are listed in there. If so,
158158/// we can append those and move on. Otherwise, it invokes the
159159/// three callback functions:
160160///
@@ -188,15 +188,16 @@ pub fn create_args_for_parent_generic_args<'tcx, 'a>(
188188 stack. push ( ( def_id, parent_defs) ) ;
189189 }
190190
191- // We manually build up the substitution , rather than using convenience
191+ // We manually build up the generic arguments , rather than using convenience
192192 // methods in `subst.rs`, so that we can iterate over the arguments and
193193 // parameters in lock-step linearly, instead of trying to match each pair.
194194 let mut args: SmallVec < [ ty:: GenericArg < ' tcx > ; 8 ] > = SmallVec :: with_capacity ( count) ;
195195 // Iterate over each segment of the path.
196196 while let Some ( ( def_id, defs) ) = stack. pop ( ) {
197197 let mut params = defs. params . iter ( ) . peekable ( ) ;
198198
199- // If we have already computed substitutions for parents, we can use those directly.
199+ // If we have already computed the generic arguments for parents,
200+ // we can use those directly.
200201 while let Some ( & param) = params. peek ( ) {
201202 if let Some ( & kind) = parent_args. get ( param. index as usize ) {
202203 args. push ( kind) ;
0 commit comments