@@ -24,25 +24,25 @@ use parity_scale_codec as codec;
24
24
pub struct ProjectName ( String ) ;
25
25
26
26
impl ProjectName {
27
- fn from_string ( input : String ) -> Result < Self , InordinateProjectNameError > {
27
+ fn from_string ( input : String ) -> Result < Self , InvalidProjectNameError > {
28
28
// Must be at least 1 character.
29
29
if input. is_empty ( ) {
30
- return Err ( InordinateProjectNameError ( "must be at least 1 character" ) ) ;
30
+ return Err ( InvalidProjectNameError ( "must be at least 1 character" ) ) ;
31
31
}
32
32
// Must be no longer than 32.
33
33
if input. len ( ) > 32 {
34
- return Err ( InordinateProjectNameError ( "must not exceed 32 characters" ) ) ;
34
+ return Err ( InvalidProjectNameError ( "must not exceed 32 characters" ) ) ;
35
35
}
36
36
// Must only consist of ASCII-encoded characters.
37
37
if !input. is_ascii ( ) {
38
- return Err ( InordinateProjectNameError ( "must be valid ASCII" ) ) ;
38
+ return Err ( InvalidProjectNameError ( "must be valid ASCII" ) ) ;
39
39
}
40
- // Must only contain a-z, 0-9 and '- ' characters.
40
+ // Must only contain a-z, 0-9, '-' and '_ ' characters.
41
41
if !input
42
42
. chars ( )
43
43
. all ( |c| c. is_ascii_digit ( ) || c. is_ascii_lowercase ( ) || c == '-' || c == '_' )
44
44
{
45
- return Err ( InordinateProjectNameError (
45
+ return Err ( InvalidProjectNameError (
46
46
"must only include a-z, 0-9 and '-'" ,
47
47
) ) ;
48
48
}
@@ -71,23 +71,23 @@ impl Into<String> for ProjectName {
71
71
}
72
72
73
73
impl TryFrom < String > for ProjectName {
74
- type Error = InordinateProjectNameError ;
74
+ type Error = InvalidProjectNameError ;
75
75
76
76
fn try_from ( input : String ) -> Result < Self , Self :: Error > {
77
77
Self :: from_string ( input)
78
78
}
79
79
}
80
80
81
81
impl TryFrom < & str > for ProjectName {
82
- type Error = InordinateProjectNameError ;
82
+ type Error = InvalidProjectNameError ;
83
83
84
84
fn try_from ( input : & str ) -> Result < Self , Self :: Error > {
85
85
Self :: from_string ( input. to_string ( ) )
86
86
}
87
87
}
88
88
89
89
impl core:: str:: FromStr for ProjectName {
90
- type Err = InordinateProjectNameError ;
90
+ type Err = InvalidProjectNameError ;
91
91
92
92
fn from_str ( s : & str ) -> Result < Self , Self :: Err > {
93
93
Self :: from_string ( s. to_string ( ) )
@@ -103,9 +103,9 @@ impl core::fmt::Display for ProjectName {
103
103
104
104
/// Error type when conversion from an inordinate input failed.
105
105
#[ derive( codec:: Encode , Clone , Debug , Eq , PartialEq ) ]
106
- pub struct InordinateProjectNameError ( & ' static str ) ;
106
+ pub struct InvalidProjectNameError ( & ' static str ) ;
107
107
108
- impl InordinateProjectNameError {
108
+ impl InvalidProjectNameError {
109
109
/// Error description
110
110
///
111
111
/// This function returns an actual error str when running in `std`
@@ -126,28 +126,28 @@ impl InordinateProjectNameError {
126
126
}
127
127
128
128
#[ cfg( feature = "std" ) ]
129
- impl std:: fmt:: Display for InordinateProjectNameError {
129
+ impl std:: fmt:: Display for InvalidProjectNameError {
130
130
fn fmt ( & self , f : & mut core:: fmt:: Formatter ) -> std:: fmt:: Result {
131
- write ! ( f, "InordinateOrgIdError ({})" , self . 0 )
131
+ write ! ( f, "InvalidOrgIdError ({})" , self . 0 )
132
132
}
133
133
}
134
134
135
135
#[ cfg( feature = "std" ) ]
136
- impl std:: error:: Error for InordinateProjectNameError {
136
+ impl std:: error:: Error for InvalidProjectNameError {
137
137
fn description ( & self ) -> & str {
138
138
self . 0
139
139
}
140
140
}
141
141
142
- impl From < & ' static str > for InordinateProjectNameError {
142
+ impl From < & ' static str > for InvalidProjectNameError {
143
143
#[ cfg( feature = "std" ) ]
144
144
fn from ( s : & ' static str ) -> Self {
145
145
Self ( s)
146
146
}
147
147
148
148
#[ cfg( not( feature = "std" ) ) ]
149
149
fn from ( s : & ' static str ) -> Self {
150
- InordinateProjectNameError ( s)
150
+ InvalidProjectNameError ( s)
151
151
}
152
152
}
153
153
0 commit comments