Skip to content

Fix building problems in extra::unicode. #8260

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Fix building problems in extra::unicode. #8260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 33 additions & 18 deletions src/libextra/unicode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#[forbid(deprecated_mode)];
#[allow(missing_doc)];

pub mod icu {
Expand Down Expand Up @@ -159,7 +158,10 @@ pub mod icu {
pub static UCHAR_INVALID_CODE : UProperty = -1;

pub mod libicu {
#[link_name = "icuuc"]
use unicode::icu::*;

// #[link_name = "icuuc"]
#[link_args = "-licuuc"]
#[abi = "cdecl"]
extern {
pub fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool;
Expand All @@ -174,13 +176,17 @@ pub mod icu {
}

pub fn is_XID_start(c: char) -> bool {
return icu::libicu::u_hasBinaryProperty(c, icu::UCHAR_XID_START)
== icu::TRUE;
unsafe {
return icu::libicu::u_hasBinaryProperty(c, icu::UCHAR_XID_START)
== icu::TRUE;
}
}

pub fn is_XID_continue(c: char) -> bool {
return icu::libicu::u_hasBinaryProperty(c, icu::UCHAR_XID_START)
== icu::TRUE;
unsafe {
return icu::libicu::u_hasBinaryProperty(c, icu::UCHAR_XID_START)
== icu::TRUE;
}
}

/*
Expand All @@ -189,7 +195,9 @@ Function: is_digit
Returns true if a character is a digit.
*/
pub fn is_digit(c: char) -> bool {
return icu::libicu::u_isdigit(c) == icu::TRUE;
unsafe {
return icu::libicu::u_isdigit(c) == icu::TRUE;
}
}

/*
Expand All @@ -198,7 +206,9 @@ Function: is_lower
Returns true if a character is a lowercase letter.
*/
pub fn is_lower(c: char) -> bool {
return icu::libicu::u_islower(c) == icu::TRUE;
unsafe {
return icu::libicu::u_islower(c) == icu::TRUE;
}
}

/*
Expand All @@ -207,7 +217,9 @@ Function: is_space
Returns true if a character is space.
*/
pub fn is_space(c: char) -> bool {
return icu::libicu::u_isspace(c) == icu::TRUE;
unsafe {
return icu::libicu::u_isspace(c) == icu::TRUE;
}
}

/*
Expand All @@ -216,33 +228,36 @@ Function: is_upper
Returns true if a character is an uppercase letter.
*/
pub fn is_upper(c: char) -> bool {
return icu::libicu::u_isupper(c) == icu::TRUE;
unsafe {
return icu::libicu::u_isupper(c) == icu::TRUE;
}
}

#[cfg(test)]
mod tests {
use unicode::*;

#[test]
fn test_is_digit() {
assert!((unicode::icu::is_digit('0')));
assert!((!unicode::icu::is_digit('m')));
assert!((is_digit('0')));
assert!((!is_digit('m')));
}

#[test]
fn test_is_lower() {
assert!((unicode::icu::is_lower('m')));
assert!((!unicode::icu::is_lower('M')));
assert!((is_lower('m')));
assert!((!is_lower('M')));
}

#[test]
fn test_is_space() {
assert!((unicode::icu::is_space(' ')));
assert!((!unicode::icu::is_space('m')));
assert!((is_space(' ')));
assert!((!is_space('m')));
}

#[test]
fn test_is_upper() {
assert!((unicode::icu::is_upper('M')));
assert!((!unicode::icu::is_upper('m')));
assert!((is_upper('M')));
assert!((!is_upper('m')));
}
}