Skip to content

Commit bb33f89

Browse files
author
Marcel Hellwig
committed
Corrected spelling inconsistency
resolves #57773
1 parent b5f5a27 commit bb33f89

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

src/librustc/hir/lowering.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,7 @@ impl<'a> LoweringContext<'a> {
19151915

19161916
fn lower_parenthesized_parameter_data(
19171917
&mut self,
1918-
data: &ParenthesisedArgs,
1918+
data: &ParenthesizedArgs,
19191919
) -> (hir::GenericArgs, bool) {
19201920
// Switch to `PassThrough` mode for anonymous lifetimes: this
19211921
// means that we permit things like `&Ref<T>`, where `Ref` has
@@ -1925,7 +1925,7 @@ impl<'a> LoweringContext<'a> {
19251925
self.with_anonymous_lifetime_mode(
19261926
AnonymousLifetimeMode::PassThrough,
19271927
|this| {
1928-
let &ParenthesisedArgs { ref inputs, ref output, span } = data;
1928+
let &ParenthesizedArgs { ref inputs, ref output, span } = data;
19291929
let inputs = inputs
19301930
.iter()
19311931
.map(|ty| this.lower_ty_direct(ty, ImplTraitContext::disallowed()))

src/libsyntax/ast.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ pub enum GenericArgs {
136136
/// The `<'a, A,B,C>` in `foo::bar::baz::<'a, A,B,C>`
137137
AngleBracketed(AngleBracketedArgs),
138138
/// The `(A,B)` and `C` in `Foo(A,B) -> C`
139-
Parenthesized(ParenthesisedArgs),
139+
Parenthesized(ParenthesizedArgs),
140140
}
141141

142142
impl GenericArgs {
@@ -173,15 +173,15 @@ impl Into<Option<P<GenericArgs>>> for AngleBracketedArgs {
173173
}
174174
}
175175

176-
impl Into<Option<P<GenericArgs>>> for ParenthesisedArgs {
176+
impl Into<Option<P<GenericArgs>>> for ParenthesizedArgs {
177177
fn into(self) -> Option<P<GenericArgs>> {
178178
Some(P(GenericArgs::Parenthesized(self)))
179179
}
180180
}
181181

182182
/// A path like `Foo(A,B) -> C`
183183
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
184-
pub struct ParenthesisedArgs {
184+
pub struct ParenthesizedArgs {
185185
/// Overall span
186186
pub span: Span,
187187

src/libsyntax/fold.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ pub trait Folder : Sized {
207207
noop_fold_angle_bracketed_parameter_data(p, self)
208208
}
209209

210-
fn fold_parenthesized_parameter_data(&mut self, p: ParenthesisedArgs)
211-
-> ParenthesisedArgs
210+
fn fold_parenthesized_parameter_data(&mut self, p: ParenthesizedArgs)
211+
-> ParenthesizedArgs
212212
{
213213
noop_fold_parenthesized_parameter_data(p, self)
214214
}
@@ -504,12 +504,12 @@ pub fn noop_fold_angle_bracketed_parameter_data<T: Folder>(data: AngleBracketedA
504504
}
505505
}
506506

507-
pub fn noop_fold_parenthesized_parameter_data<T: Folder>(data: ParenthesisedArgs,
507+
pub fn noop_fold_parenthesized_parameter_data<T: Folder>(data: ParenthesizedArgs,
508508
fld: &mut T)
509-
-> ParenthesisedArgs
509+
-> ParenthesizedArgs
510510
{
511-
let ParenthesisedArgs { inputs, output, span } = data;
512-
ParenthesisedArgs {
511+
let ParenthesizedArgs { inputs, output, span } = data;
512+
ParenthesizedArgs {
513513
inputs: inputs.move_map(|ty| fld.fold_ty(ty)),
514514
output: output.map(|ty| fld.fold_ty(ty)),
515515
span: fld.new_span(span)

src/libsyntax/parse/parser.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc_target::spec::abi::{self, Abi};
2-
use ast::{AngleBracketedArgs, ParenthesisedArgs, AttrStyle, BareFnTy};
2+
use ast::{AngleBracketedArgs, ParenthesizedArgs, AttrStyle, BareFnTy};
33
use ast::{GenericBound, TraitBoundModifier};
44
use ast::Unsafety;
55
use ast::{Mod, AnonConst, Arg, Arm, Guard, Attribute, BindingMode, TraitItemKind};
@@ -2203,7 +2203,7 @@ impl<'a> Parser<'a> {
22032203
} else {
22042204
None
22052205
};
2206-
ParenthesisedArgs { inputs, output, span }.into()
2206+
ParenthesizedArgs { inputs, output, span }.into()
22072207
};
22082208

22092209
PathSegment { ident, args, id: ast::DUMMY_NODE_ID }

src/test/ui/parenthesised-deref-suggestion.stderr renamed to src/test/ui/parenthesized-deref-suggestion.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0609]: no field `opts` on type `*const Session`
2-
--> $DIR/parenthesised-deref-suggestion.rs:7:30
2+
--> $DIR/parenthesized-deref-suggestion.rs:7:30
33
|
44
LL | (sess as *const Session).opts; //~ ERROR no field `opts` on type `*const Session`
55
| ^^^^
@@ -9,7 +9,7 @@ LL | (*(sess as *const Session)).opts; //~ ERROR no field `opts` on type `*c
99
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1010

1111
error[E0609]: no field `0` on type `[u32; 1]`
12-
--> $DIR/parenthesised-deref-suggestion.rs:10:21
12+
--> $DIR/parenthesized-deref-suggestion.rs:10:21
1313
|
1414
LL | (x as [u32; 1]).0; //~ ERROR no field `0` on type `[u32; 1]`
1515
| ----------------^

0 commit comments

Comments
 (0)