Rename ParenthesizedArgData to ParenthesisedArgs

diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 7628504ba0dc1d2d5840182a5dff54df93dd1490..4e9bf8047e9e8b30e1b21a353c5d989dcba5df1c 100644 (file)
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -1747,7 +1747,7 @@ fn lower_angle_bracketed_parameter_data(
 
     fn lower_parenthesized_parameter_data(
         &mut self,
-        data: &ParenthesizedArgData,
+        data: &ParenthesisedArgs,
     ) -> (hir::GenericArgs, bool) {
         // Switch to `PassThrough` mode for anonymous lifetimes: this
         // means that we permit things like `&Ref<T>`, where `Ref` has
@@ -1758,7 +1758,7 @@ fn lower_parenthesized_parameter_data(
             AnonymousLifetimeMode::PassThrough,
             |this| {
                 const DISALLOWED: ImplTraitContext = ImplTraitContext::Disallowed;
-                let &ParenthesizedArgData { ref inputs, ref output, span } = data;
+                let &ParenthesisedArgs { ref inputs, ref output, span } = data;
                 let inputs = inputs.iter().map(|ty| this.lower_ty(ty, DISALLOWED)).collect();
                 let mk_tup = |this: &mut Self, tys, span| {
                     let LoweredNodeId { node_id, hir_id } = this.next_id();

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 76d19ce0ac5b2b4f030c572fce99132c2621f813..c6de2c4da39cfb59238af3da3e5cd89069f0c09a 100644 (file)
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -146,7 +146,7 @@ pub enum GenericArgs {
     /// The `<'a, A,B,C>` in `foo::bar::baz::<'a, A,B,C>`
     AngleBracketed(AngleBracketedArgs),
     /// The `(A,B)` and `C` in `Foo(A,B) -> C`
-    Parenthesized(ParenthesizedArgData),
+    Parenthesized(ParenthesisedArgs),
 }
 
 impl GenericArgs {
@@ -183,7 +183,7 @@ fn into(self) -> Option<P<GenericArgs>> {
     }
 }
 
-impl Into<Option<P<GenericArgs>>> for ParenthesizedArgData {
+impl Into<Option<P<GenericArgs>>> for ParenthesisedArgs {
     fn into(self) -> Option<P<GenericArgs>> {
         Some(P(GenericArgs::Parenthesized(self)))
     }
@@ -191,7 +191,7 @@ fn into(self) -> Option<P<GenericArgs>> {
 
 /// A path like `Foo(A,B) -> C`
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
-pub struct ParenthesizedArgData {
+pub struct ParenthesisedArgs {
     /// Overall span
     pub span: Span,
 

diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index 03668cc279a2cb0afd54d08124527de70fd63d10..93248fe3bfab0a0ac8971755f3fa73314f0c7c5b 100644 (file)
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -193,8 +193,8 @@ fn fold_angle_bracketed_parameter_data(&mut self, p: AngleBracketedArgs)
         noop_fold_angle_bracketed_parameter_data(p, self)
     }
 
-    fn fold_parenthesized_parameter_data(&mut self, p: ParenthesizedArgData)
-                                         -> ParenthesizedArgData
+    fn fold_parenthesized_parameter_data(&mut self, p: ParenthesisedArgs)
+                                         -> ParenthesisedArgs
     {
         noop_fold_parenthesized_parameter_data(p, self)
     }
@@ -483,12 +483,12 @@ pub fn noop_fold_angle_bracketed_parameter_data<T: Folder>(data: AngleBracketedA
     }
 }
 
-pub fn noop_fold_parenthesized_parameter_data<T: Folder>(data: ParenthesizedArgData,
+pub fn noop_fold_parenthesized_parameter_data<T: Folder>(data: ParenthesisedArgs,
                                                          fld: &mut T)
-                                                         -> ParenthesizedArgData
+                                                         -> ParenthesisedArgs
 {
-    let ParenthesizedArgData { inputs, output, span } = data;
-    ParenthesizedArgData {
+    let ParenthesisedArgs { inputs, output, span } = data;
+    ParenthesisedArgs {
         inputs: inputs.move_map(|ty| fld.fold_ty(ty)),
         output: output.map(|ty| fld.fold_ty(ty)),
         span: fld.new_span(span)

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 2bb8fff40370e96de79e6a1cc5d83637bd26f24a..6f78ae9ebca5dd0c2d7f22d1f7c2272ce945b4cb 100644 (file)
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use rustc_target::spec::abi::{self, Abi};
-use ast::{AngleBracketedArgs, ParenthesizedArgData, AttrStyle, BareFnTy};
+use ast::{AngleBracketedArgs, ParenthesisedArgs, AttrStyle, BareFnTy};
 use ast::{GenericBound, TraitBoundModifier};
 use ast::Unsafety;
 use ast::{Mod, AnonConst, Arg, Arm, Attribute, BindingMode, TraitItemKind};
@@ -1988,7 +1988,7 @@ fn parse_path_segment(&mut self, style: PathStyle, enable_warning: bool)
                     None
                 };
                 let span = lo.to(self.prev_span);
-                ParenthesizedArgData { inputs, output, span }.into()
+                ParenthesisedArgs { inputs, output, span }.into()
             };
 
             PathSegment { ident, args }