[libstd_unicode] Create UnicodeVersion type
Create named struct `UnicodeVersion` to use instead of tuple type for `UNICODE_VERSION` value. This allows user to access the fields with meaningful field names: `major`, `minor`, and `micro`. Per request, an empty private field is added to the struct, so it can be extended in the future without API breakage.
This commit is contained in:
@@ -12,9 +12,32 @@
|
|||||||
|
|
||||||
#![allow(missing_docs, non_upper_case_globals, non_snake_case)]
|
#![allow(missing_docs, non_upper_case_globals, non_snake_case)]
|
||||||
|
|
||||||
/// The version of [Unicode](http://www.unicode.org/)
|
/// Represents a Unicode Version.
|
||||||
/// that the unicode parts of `CharExt` and `UnicodeStrPrelude` traits are based on.
|
///
|
||||||
pub const UNICODE_VERSION: (u32, u32, u32) = (10, 0, 0);
|
/// See also: <http://www.unicode.org/versions/>
|
||||||
|
#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
|
||||||
|
pub struct UnicodeVersion {
|
||||||
|
/// Major version.
|
||||||
|
pub major: u32,
|
||||||
|
|
||||||
|
/// Minor version.
|
||||||
|
pub minor: u32,
|
||||||
|
|
||||||
|
/// Micro (or Update) version.
|
||||||
|
pub micro: u32,
|
||||||
|
|
||||||
|
// Private field to keep struct expandable.
|
||||||
|
_priv: (),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The version of [Unicode](http://www.unicode.org/) that the Unicode parts of
|
||||||
|
/// `CharExt` and `UnicodeStrPrelude` traits are based on.
|
||||||
|
pub const UNICODE_VERSION: UnicodeVersion = UnicodeVersion {
|
||||||
|
major: 10,
|
||||||
|
minor: 0,
|
||||||
|
micro: 0,
|
||||||
|
_priv: (),
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
// BoolTrie is a trie for representing a set of Unicode codepoints. It is
|
// BoolTrie is a trie for representing a set of Unicode codepoints. It is
|
||||||
|
|||||||
@@ -560,9 +560,32 @@ if __name__ == "__main__":
|
|||||||
pattern = "for Version (\d+)\.(\d+)\.(\d+) of the Unicode"
|
pattern = "for Version (\d+)\.(\d+)\.(\d+) of the Unicode"
|
||||||
unicode_version = re.search(pattern, readme.read()).groups()
|
unicode_version = re.search(pattern, readme.read()).groups()
|
||||||
rf.write("""
|
rf.write("""
|
||||||
/// The version of [Unicode](http://www.unicode.org/)
|
/// Represents a Unicode Version.
|
||||||
/// that the unicode parts of `CharExt` and `UnicodeStrPrelude` traits are based on.
|
///
|
||||||
pub const UNICODE_VERSION: (u32, u32, u32) = (%s, %s, %s);
|
/// See also: <http://www.unicode.org/versions/>
|
||||||
|
#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
|
||||||
|
pub struct UnicodeVersion {
|
||||||
|
/// Major version.
|
||||||
|
pub major: u32,
|
||||||
|
|
||||||
|
/// Minor version.
|
||||||
|
pub minor: u32,
|
||||||
|
|
||||||
|
/// Micro (or Update) version.
|
||||||
|
pub micro: u32,
|
||||||
|
|
||||||
|
// Private field to keep struct expandable.
|
||||||
|
_priv: (),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The version of [Unicode](http://www.unicode.org/) that the Unicode parts of
|
||||||
|
/// `CharExt` and `UnicodeStrPrelude` traits are based on.
|
||||||
|
pub const UNICODE_VERSION: UnicodeVersion = UnicodeVersion {
|
||||||
|
major: %s,
|
||||||
|
minor: %s,
|
||||||
|
micro: %s,
|
||||||
|
_priv: (),
|
||||||
|
};
|
||||||
""" % unicode_version)
|
""" % unicode_version)
|
||||||
(canon_decomp, compat_decomp, gencats, combines,
|
(canon_decomp, compat_decomp, gencats, combines,
|
||||||
to_upper, to_lower, to_title) = load_unicode_data("UnicodeData.txt")
|
to_upper, to_lower, to_title) = load_unicode_data("UnicodeData.txt")
|
||||||
|
|||||||
Reference in New Issue
Block a user