Skip to content

Commit 8a8f631

Browse files
fmt
1 parent 54e64b3 commit 8a8f631

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/uu/sort/src/sort.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ use clap::builder::ValueParser;
2424
use clap::{Arg, ArgAction, Command};
2525
use custom_str_cmp::custom_str_cmp;
2626

27-
#[cfg(feature = "i18n-collator")]
28-
use uucore::i18n::collator::{locale_cmp, try_init_collator};
2927
use ext_sort::ext_sort;
3028
use fnv::FnvHasher;
3129
#[cfg(target_os = "linux")]
@@ -50,6 +48,8 @@ use uucore::error::{FromIo, strip_errno};
5048
use uucore::error::{UError, UResult, USimpleError, UUsageError};
5149
use uucore::extendedbigdecimal::ExtendedBigDecimal;
5250
use uucore::format_usage;
51+
#[cfg(feature = "i18n-collator")]
52+
use uucore::i18n::collator::{locale_cmp, try_init_collator};
5353
use uucore::line_ending::LineEnding;
5454
use uucore::parser::num_parser::{ExtendedParser, ExtendedParserError};
5555
use uucore::parser::parse_size::{ParseSizeError, Parser};
@@ -350,7 +350,8 @@ impl GlobalSettings {
350350
.filter(|s| matches!(s.settings.mode, SortMode::GeneralNumeric))
351351
.count();
352352

353-
self.precomputed.fast_lexicographic = !disable_fast_lexicographic && self.can_use_fast_lexicographic();
353+
self.precomputed.fast_lexicographic =
354+
!disable_fast_lexicographic && self.can_use_fast_lexicographic();
354355
self.precomputed.fast_ascii_insensitive = self.can_use_fast_ascii_insensitive();
355356
}
356357

@@ -1404,8 +1405,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
14041405
// This MUST happen before init_precomputed() to avoid the performance regression
14051406
#[cfg(feature = "i18n-collator")]
14061407
let needs_locale_collation = {
1407-
use uucore::i18n::{get_locale_encoding, UEncoding};
14081408
use uucore::i18n::collator::{AlternateHandling, CollatorOptions};
1409+
use uucore::i18n::{UEncoding, get_locale_encoding};
14091410

14101411
let is_utf8_locale = get_locale_encoding() == UEncoding::Utf8;
14111412

0 commit comments

Comments
 (0)