Move static code outside of unciode.py. #47088
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
clarfonthey
force-pushed
the
cleanup_unicode_py
branch
from
73cf9c3 to
57f5173
Compare
|
(rust_highfive has picked a reviewer for you, use r? to override) |
clarfonthey
force-pushed
the
cleanup_unicode_py
branch
2 times, most recently
from
1a94ca7 to
157f58b
Compare
kennytm
added
the
S-waiting-on-review
kennytm
reviewed
Dec 31, 2017
src/libstd_unicode/tables.rs
Outdated
| pub mod general_category { | ||
| pub const Cc_table: &'static super::SmallBoolTrie = &super::SmallBoolTrie { | ||
| pub const Cc_table: &SmallBoolTrie = &super::SmallBoolTrie { |
There was a problem hiding this comment.
[00:04:03] error[E0412]: cannot find type `SmallBoolTrie` in this scope
[00:04:03] --> /checkout/src/libstd_unicode/tables.rs:29:26
[00:04:03] |
[00:04:03] 29 | pub const Cc_table: &SmallBoolTrie = &super::SmallBoolTrie {
[00:04:03] | ^^^^^^^^^^^^^ not found in this scope
[00:04:03] help: possible candidate is found in another module, you can import it into scope
[00:04:03] |
[00:04:03] 29 | use bool_trie::SmallBoolTrie;
[00:04:03] |
src/libstd_unicode/tables.rs
Outdated
| @@ -120,7 +39,7 @@ pub mod general_category { | |||
| Cc_table.lookup(c) | |||
| } | |||
|
|
|||
| pub const N_table: &'static super::BoolTrie = &super::BoolTrie { | |||
| pub const N_table: &BoolTrie = &BoolTrie { | |||
There was a problem hiding this comment.
[00:04:03] error[E0412]: cannot find type `BoolTrie` in this scope
[00:04:03] --> /checkout/src/libstd_unicode/tables.rs:42:25
[00:04:03] |
[00:04:03] 42 | pub const N_table: &BoolTrie = &BoolTrie {
[00:04:03] | ^^^^^^^^ not found in this scope
[00:04:03] help: possible candidate is found in another module, you can import it into scope
[00:04:03] |
[00:04:03] 29 | use bool_trie::BoolTrie;
[00:04:03] |
[00:04:03]
[00:04:03] error[E0422]: cannot find struct, variant or union type `BoolTrie` in this scope
[00:04:03] --> /checkout/src/libstd_unicode/tables.rs:42:37
[00:04:03] |
[00:04:03] 42 | pub const N_table: &BoolTrie = &BoolTrie {
[00:04:03] | ^^^^^^^^ not found in this scope
[00:04:03] help: possible candidate is found in another module, you can import it into scope
[00:04:03] |
[00:04:03] 29 | use bool_trie::BoolTrie;
[00:04:03] |
src/libstd_unicode/tables.rs
Outdated
| } | ||
|
|
||
| } | ||
|
|
||
| pub mod derived_property { | ||
| pub const Alphabetic_table: &'static super::BoolTrie = &super::BoolTrie { | ||
| pub const Alphabetic_table: &BoolTrie = &BoolTrie { |
There was a problem hiding this comment.
cannot find type BoolTrie in this scope
src/libstd_unicode/tables.rs
Outdated
| } | ||
|
|
||
| pub const Case_Ignorable_table: &'static super::BoolTrie = &super::BoolTrie { | ||
| pub const Case_Ignorable_table: &BoolTrie = &BoolTrie { |
| _priv: (), | ||
| } | ||
| use version::UnicodeVersion; | ||
| use bool_trie::{BoolTrie, SmallBoolTrie}; |
There was a problem hiding this comment.
[00:04:03] error: unused import: `BoolTrie`
[00:04:03] --> /checkout/src/libstd_unicode/tables.rs:16:17
[00:04:03] |
[00:04:03] 16 | use bool_trie::{BoolTrie, SmallBoolTrie};
[00:04:03] | ^^^^^^^^
[00:04:03] |
|
@kennytm I actually just stumbled upon those errors this morning; I just pushed the fix. |
clarfonthey
force-pushed
the
cleanup_unicode_py
branch
from
157f58b to
bf7cf86
Compare
alexcrichton
reviewed
Jan 2, 2018
src/libstd_unicode/version.rs
Outdated
| /// Represents a Unicode Version. | ||
| /// | ||
| /// See also: <http://www.unicode.org/versions/> | ||
| #[non_exhaustive] |
There was a problem hiding this comment.
Could this be omitted? It seems like there's not really much need to pull in a new unstable feature to this library
There was a problem hiding this comment.
Will leave this to #47122 to fix and remove it from this PR.
src/libstd_unicode/bool_trie.rs
Outdated
| /// non-BMP range of most Unicode sets. | ||
| pub struct BoolTrie { | ||
| // 0..0x800 (corresponding to 1 and 2 byte utf-8 sequences) | ||
| pub(crate) r1: [u64; 32], // leaves |
There was a problem hiding this comment.
Can these just be pub as this module isn't exported anyway?
clarfonthey
force-pushed
the
cleanup_unicode_py
branch
2 times, most recently
from
60f9f98 to
c4dceb0
Compare
|
Requested changes have been made. |
clarfonthey
force-pushed
the
cleanup_unicode_py
branch
from
c4dceb0 to
9413973
Compare
clarfonthey
force-pushed
the
cleanup_unicode_py
branch
from
9413973 to
b4b3ddd
Compare
|
@bors: r+ |
|
📌 Commit b4b3ddd has been approved by |
bors
added a commit
that referenced
this pull request
Jan 3, 2018
Move static code outside of unciode.py. This script in libstd_unicode is a mess and also contains code that shouldn't be output by a script, and instead just put in modules. So, this change does that.
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This script in libstd_unicode is a mess and also contains code that shouldn't be output by a script, and instead just put in modules. So, this change does that.