Skip to content

Rename functions in Ascii #14401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2014
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rename functions in Ascii
Some functions implemented for the Ascii struct have the same functionality as other functions implemented for the normal chars. For consistency, I think they should have the same name, so I renamed the functions in Ascii to match the names in the Char trait.

* Renamed `to_lower` to `to_lowercase`
* Renamed `to_upper` to `to_uppercase`
* Renamed `is_alpha` to `is_alphabetic`
* Renamed `is_alnum` to `is_alphanumeric`
* Renamed `is_lower` to `is_lowercase`
* Renamed `is_upper` to `is_uppercase`

[breaking-change]
  • Loading branch information
aochagavia committed May 24, 2014
commit f7ccae5f158cbbb7b910e59befb293e262d3dc1b
54 changes: 48 additions & 6 deletions src/libstd/ascii.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,29 @@ impl Ascii {
self.chr as char
}

/// Convert to lowercase.
#[inline]
#[allow(missing_doc)]
#[deprecated="renamed to `to_lowercase`"]
pub fn to_lower(self) -> Ascii {
self.to_lowercase()
}

/// Convert to lowercase.
#[inline]
pub fn to_lowercase(self) -> Ascii {
Ascii{chr: ASCII_LOWER_MAP[self.chr as uint]}
}

/// Convert to uppercase.
#[inline]
#[allow(missing_doc)]
#[deprecated="renamed to `to_uppercase`"]
pub fn to_upper(self) -> Ascii {
self.to_uppercase()
}

/// Convert to uppercase.
#[inline]
pub fn to_uppercase(self) -> Ascii {
Ascii{chr: ASCII_UPPER_MAP[self.chr as uint]}
}

Expand All @@ -59,9 +73,16 @@ impl Ascii {

// the following methods are like ctype, and the implementation is inspired by musl

/// Check if the character is a letter (a-z, A-Z)
#[inline]
#[allow(missing_doc)]
#[deprecated="renamed to `is_alphabetic`"]
pub fn is_alpha(&self) -> bool {
self.is_alphabetic()
}

/// Check if the character is a letter (a-z, A-Z)
#[inline]
pub fn is_alphabetic(&self) -> bool {
(self.chr >= 0x41 && self.chr <= 0x5A) || (self.chr >= 0x61 && self.chr <= 0x7A)
}

Expand All @@ -71,9 +92,16 @@ impl Ascii {
self.chr >= 0x30 && self.chr <= 0x39
}

/// Check if the character is a letter or number
#[inline]
#[allow(missing_doc)]
#[deprecated="renamed to `is_alphanumeric`"]
pub fn is_alnum(&self) -> bool {
self.is_alphanumeric()
}

/// Check if the character is a letter or number
#[inline]
pub fn is_alphanumeric(&self) -> bool {
self.is_alpha() || self.is_digit()
}

Expand Down Expand Up @@ -101,15 +129,29 @@ impl Ascii {
(self.chr - 0x20) < 0x5F
}

/// Checks if the character is lowercase
#[inline]
#[allow(missing_doc)]
#[deprecated="renamed to `is_lowercase`"]
pub fn is_lower(&self) -> bool {
self.is_lowercase()
}

/// Checks if the character is lowercase
#[inline]
pub fn is_lowercase(&self) -> bool {
(self.chr - 'a' as u8) < 26
}

/// Checks if the character is uppercase
#[inline]
#[allow(missing_doc)]
#[deprecated="renamed to `is_uppercase`"]
pub fn is_upper(&self) -> bool {
self.is_uppercase()
}

/// Checks if the character is uppercase
#[inline]
pub fn is_uppercase(&self) -> bool {
(self.chr - 'A' as u8) < 26
}

Expand Down