Skip to content

Commit 270d6cd

Browse files
committed
Auto merge of rust-lang#79867 - tmandry:rollup-7mubs3b, r=tmandry
Rollup of 12 pull requests Successful merges: - rust-lang#79732 (minor stylistic clippy cleanups) - rust-lang#79750 (Fix trimming of lint docs) - rust-lang#79777 (Remove `first_merge` from liveness debug logs) - rust-lang#79795 (Privatize some of libcore unicode_internals) - rust-lang#79803 (Update xsv to prevent random CI failures) - rust-lang#79810 (Account for gaps in def path table during decoding) - rust-lang#79818 (Fixes to Rust coverage) - rust-lang#79824 (Strip prefix instead of replacing it with empty string) - rust-lang#79826 (Simplify visit_{foreign,trait}_item) - rust-lang#79844 (Move RWUTable to a separate module) - rust-lang#79861 (Update LLVM submodule) - rust-lang#79862 (Remove tab-lock and replace it with ctrl+up/down arrows to switch between search result tabs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents bb99a9a + e417faa commit 270d6cd

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

alloc/src/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ impl str {
388388
}
389389

390390
fn case_ignoreable_then_cased<I: Iterator<Item = char>>(iter: I) -> bool {
391-
use core::unicode::derived_property::{Case_Ignorable, Cased};
391+
use core::unicode::{Case_Ignorable, Cased};
392392
match iter.skip_while(|&c| Case_Ignorable(c)).next() {
393393
Some(c) => Cased(c),
394394
None => false,

core/src/unicode/mod.rs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,14 @@ mod unicode_data;
1818
pub const UNICODE_VERSION: (u8, u8, u8) = unicode_data::UNICODE_VERSION;
1919

2020
// For use in liballoc, not re-exported in libstd.
21-
pub mod derived_property {
22-
pub use super::{Case_Ignorable, Cased};
23-
}
21+
pub use unicode_data::{
22+
case_ignorable::lookup as Case_Ignorable, cased::lookup as Cased, conversions,
23+
};
2424

25-
pub use unicode_data::alphabetic::lookup as Alphabetic;
26-
pub use unicode_data::case_ignorable::lookup as Case_Ignorable;
27-
pub use unicode_data::cased::lookup as Cased;
28-
pub use unicode_data::cc::lookup as Cc;
29-
pub use unicode_data::conversions;
30-
pub use unicode_data::grapheme_extend::lookup as Grapheme_Extend;
31-
pub use unicode_data::lowercase::lookup as Lowercase;
32-
pub use unicode_data::n::lookup as N;
33-
pub use unicode_data::uppercase::lookup as Uppercase;
34-
pub use unicode_data::white_space::lookup as White_Space;
25+
pub(crate) use unicode_data::alphabetic::lookup as Alphabetic;
26+
pub(crate) use unicode_data::cc::lookup as Cc;
27+
pub(crate) use unicode_data::grapheme_extend::lookup as Grapheme_Extend;
28+
pub(crate) use unicode_data::lowercase::lookup as Lowercase;
29+
pub(crate) use unicode_data::n::lookup as N;
30+
pub(crate) use unicode_data::uppercase::lookup as Uppercase;
31+
pub(crate) use unicode_data::white_space::lookup as White_Space;

0 commit comments

Comments
 (0)