diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-02-23 15:44:20 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-02-23 15:44:20 -0800 |
| commit | d08952cfa5ecef0d7a3841a666694231edc8093a (patch) | |
| tree | 1a403b6c05428d856cd51d45a59c361adb7f3e02 /src/libstd | |
| parent | eb3395574129cd3e5d49db77ade300d1b8d0b350 (diff) | |
| parent | 713ca7d5402fb33ea1ac4f34a50618d60156d1d3 (diff) | |
| download | rust-d08952cfa5ecef0d7a3841a666694231edc8093a.tar.gz rust-d08952cfa5ecef0d7a3841a666694231edc8093a.zip | |
Merge remote-tracking branch 'huonw/inline-helpers'
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/char.rs | 1 | ||||
| -rw-r--r-- | src/libstd/str.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/char.rs b/src/libstd/char.rs index 71a297d7176..1ec89d1850f 100644 --- a/src/libstd/char.rs +++ b/src/libstd/char.rs @@ -69,6 +69,7 @@ static TAG_FOUR_B: uint = 240u; pub static MAX: char = '\U0010ffff'; /// Convert from `u32` to a character. +#[inline] pub fn from_u32(i: u32) -> Option<char> { // catch out-of-bounds and surrogates if (i > MAX as u32) || (i >= 0xD800 && i <= 0xDFFF) { diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 4b03f478cd7..3c094cd631d 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -1061,6 +1061,7 @@ static UTF8_CHAR_WIDTH: [u8, ..256] = [ ]; /// Given a first byte, determine how many bytes are in this UTF-8 character +#[inline] pub fn utf8_char_width(b: u8) -> uint { return UTF8_CHAR_WIDTH[b] as uint; } |