Skip to content

Commit f160ad9

Browse files
committed
Revert "unicode_data refactors RUST-147622"
This PR reverts RUST-147622 for several reasons: 1. The RUST-147622 PR would format the generated core library code using an arbitrary `rustfmt` picked up from `PATH`, which will cause hard-to-debug failures when the `rustfmt` used to format the generated unicode data code versus the `rustfmt` used to format the in-tree library code. 2. Previously, the `unicode-table-generator` tests were not run under CI as part of `coretests`, and since for `x86_64-gnu-aux` job we run library `coretests` with `miri`, the generated tests unfortunately caused an unacceptably large Merge CI time regression from ~2 hours to ~3.5 hours, making it the slowest Merge CI job (and thus the new bottleneck). 3. This PR also has an unintended effect of causing a diagnostic regression (RUST-148387), though that's mostly an edge case not properly handled by `rustc` diagnostics. Given that these are three distinct causes with non-trivial fixes, I'm proposing to revert this PR to return us to baseline. This is not prejudice against relanding the changes with these issues addressed, but to alleviate time pressure to address these non-trivial issues.
1 parent 29dc0a1 commit f160ad9

File tree

6 files changed

+1216
-4511
lines changed

6 files changed

+1216
-4511
lines changed

core/src/unicode/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ pub(crate) use unicode_data::white_space::lookup as White_Space;
1818

1919
pub(crate) mod printable;
2020

21-
mod rt;
2221
#[allow(unreachable_pub)]
23-
pub mod unicode_data;
22+
mod unicode_data;
2423

2524
/// The version of [Unicode](https://www.unicode.org/) that the Unicode parts of
2625
/// `char` and `str` methods are based on.

core/src/unicode/rt.rs

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)