Skip to content
This repository was archived by the owner on Feb 28, 2021. It is now read-only.

Commit 1035f98

Browse files
committed
Incorporate feedback
1 parent 1deaa0f commit 1035f98

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

core/src/project_name.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@ use parity_scale_codec as codec;
2424
pub struct ProjectName(String);
2525

2626
impl ProjectName {
27-
fn from_string(input: String) -> Result<Self, InordinateProjectNameError> {
27+
fn from_string(input: String) -> Result<Self, InvalidProjectNameError> {
2828
// Must be at least 1 character.
2929
if input.is_empty() {
30-
return Err(InordinateProjectNameError("must be at least 1 character"));
30+
return Err(InvalidProjectNameError("must be at least 1 character"));
3131
}
3232
// Must be no longer than 32.
3333
if input.len() > 32 {
34-
return Err(InordinateProjectNameError("must not exceed 32 characters"));
34+
return Err(InvalidProjectNameError("must not exceed 32 characters"));
3535
}
3636
// Must only consist of ASCII-encoded characters.
3737
if !input.is_ascii() {
38-
return Err(InordinateProjectNameError("must be valid ASCII"));
38+
return Err(InvalidProjectNameError("must be valid ASCII"));
3939
}
40-
// Must only contain a-z, 0-9 and '-' characters.
40+
// Must only contain a-z, 0-9, '-' and '_' characters.
4141
if !input
4242
.chars()
4343
.all(|c| c.is_ascii_digit() || c.is_ascii_lowercase() || c == '-' || c == '_')
4444
{
45-
return Err(InordinateProjectNameError(
45+
return Err(InvalidProjectNameError(
4646
"must only include a-z, 0-9 and '-'",
4747
));
4848
}
@@ -71,23 +71,23 @@ impl Into<String> for ProjectName {
7171
}
7272

7373
impl TryFrom<String> for ProjectName {
74-
type Error = InordinateProjectNameError;
74+
type Error = InvalidProjectNameError;
7575

7676
fn try_from(input: String) -> Result<Self, Self::Error> {
7777
Self::from_string(input)
7878
}
7979
}
8080

8181
impl TryFrom<&str> for ProjectName {
82-
type Error = InordinateProjectNameError;
82+
type Error = InvalidProjectNameError;
8383

8484
fn try_from(input: &str) -> Result<Self, Self::Error> {
8585
Self::from_string(input.to_string())
8686
}
8787
}
8888

8989
impl core::str::FromStr for ProjectName {
90-
type Err = InordinateProjectNameError;
90+
type Err = InvalidProjectNameError;
9191

9292
fn from_str(s: &str) -> Result<Self, Self::Err> {
9393
Self::from_string(s.to_string())
@@ -103,9 +103,9 @@ impl core::fmt::Display for ProjectName {
103103

104104
/// Error type when conversion from an inordinate input failed.
105105
#[derive(codec::Encode, Clone, Debug, Eq, PartialEq)]
106-
pub struct InordinateProjectNameError(&'static str);
106+
pub struct InvalidProjectNameError(&'static str);
107107

108-
impl InordinateProjectNameError {
108+
impl InvalidProjectNameError {
109109
/// Error description
110110
///
111111
/// This function returns an actual error str when running in `std`
@@ -126,28 +126,28 @@ impl InordinateProjectNameError {
126126
}
127127

128128
#[cfg(feature = "std")]
129-
impl std::fmt::Display for InordinateProjectNameError {
129+
impl std::fmt::Display for InvalidProjectNameError {
130130
fn fmt(&self, f: &mut core::fmt::Formatter) -> std::fmt::Result {
131-
write!(f, "InordinateOrgIdError({})", self.0)
131+
write!(f, "InvalidOrgIdError({})", self.0)
132132
}
133133
}
134134

135135
#[cfg(feature = "std")]
136-
impl std::error::Error for InordinateProjectNameError {
136+
impl std::error::Error for InvalidProjectNameError {
137137
fn description(&self) -> &str {
138138
self.0
139139
}
140140
}
141141

142-
impl From<&'static str> for InordinateProjectNameError {
142+
impl From<&'static str> for InvalidProjectNameError {
143143
#[cfg(feature = "std")]
144144
fn from(s: &'static str) -> Self {
145145
Self(s)
146146
}
147147

148148
#[cfg(not(feature = "std"))]
149149
fn from(s: &'static str) -> Self {
150-
InordinateProjectNameError(s)
150+
InvalidProjectNameError(s)
151151
}
152152
}
153153

0 commit comments

Comments
 (0)