use num_format

diff --git a/Cargo.lock b/Cargo.lock
index 5066d5f0f5ebe2bfc7c23fdc39017ef021d94ec2..51e11d28dfb4641a9d0faac0411f427e951ea07d 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,6 +47,15 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
 
+[[package]]
+name = "arrayvec"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
+dependencies = [
+ "nodrop",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.7.0"
@@ -459,7 +468,7 @@ dependencies = [
 name = "hir"
 version = "0.0.0"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.7.0",
  "base_db",
  "cfg",
  "either",
@@ -529,7 +538,7 @@ dependencies = [
 name = "hir_ty"
 version = "0.0.0"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.7.0",
  "base_db",
  "chalk-ir",
  "chalk-recursive",
@@ -582,6 +591,7 @@ dependencies = [
  "indexmap",
  "itertools",
  "log",
+ "num-format",
  "oorandom",
  "profile",
  "pulldown-cmark",
@@ -934,6 +944,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+
 [[package]]
 name = "notify"
 version = "5.0.0-pre.9"
@@ -960,6 +976,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num-format"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465"
+dependencies = [
+ "arrayvec 0.4.12",
+ "itoa",
+]
+
 [[package]]
 name = "num_cpus"
 version = "1.13.0"
@@ -1317,6 +1343,7 @@ dependencies = [
  "lsp-types",
  "mbe",
  "mimalloc",
+ "num-format",
  "oorandom",
  "parking_lot",
  "proc_macro_srv",
@@ -1560,7 +1587,7 @@ dependencies = [
 name = "syntax"
 version = "0.0.0"
 dependencies = [
- "arrayvec",
+ "arrayvec 0.7.0",
  "cov-mark",
  "expect-test",
  "indexmap",

diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 0e84473940a7257c66477599282a8aad5d108f19..e76fa5c2dd31f693edec94cac9bc64208416eca5 100644 (file)
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -21,7 +21,7 @@ pulldown-cmark-to-cmark = "6.0.0"
 pulldown-cmark = { version = "0.8.0", default-features = false }
 url = "2.1.1"
 dot = "0.1.4"
-
+num-format = "0.4.0"
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
 text_edit = { path = "../text_edit", version = "0.0.0" }

diff --git a/crates/ide/src/status.rs b/crates/ide/src/status.rs
index ff18e2d2d15bcce64617a07dc04e5287517cf5b6..f0b670cd6e956f88a1d0b5b00cf59d1de8f9cf05 100644 (file)
--- a/crates/ide/src/status.rs
+++ b/crates/ide/src/status.rs
@@ -10,6 +10,7 @@
     RootDatabase,
 };
 use itertools::Itertools;
+use num_format::{Buffer, Locale};
 use profile::{memory_usage, Bytes};
 use rustc_hash::FxHashMap;
 use stdx::format_to;
@@ -109,7 +110,8 @@ pub(crate) struct SyntaxTreeStats {
 
 impl fmt::Display for SyntaxTreeStats {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "{} trees, {} preserved", self.total, self.retained)
+        let buf = Buffer::default().write_formatted(&self.total, &Locale::en);
+        write!(fmt, "{} trees, {} preserved", buf.to_string(), self.retained)
     }
 }
 

diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 3010815df7fb54562e0435d599edfbff70809d2d..9be140b58bc0e19c3e8ee26d8d3e7152d823721d 100644 (file)
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -38,7 +38,7 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] }
 tracing-tree = { version = "0.1.4" }
 always-assert = "0.1"
-
+num-format = "0.4.0"
 stdx = { path = "../stdx", version = "0.0.0" }
 flycheck = { path = "../flycheck", version = "0.0.0" }
 ide = { path = "../ide", version = "0.0.0" }

diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 3fd8b3cff7fadb1259677d5188105667de5b43a6..9858ac717ff58f24a11a70893739a2fa7a872d16 100644 (file)
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -25,6 +25,7 @@
     SemanticTokensRangeResult, SemanticTokensResult, SymbolInformation, SymbolTag,
     TextDocumentIdentifier, TextDocumentPositionParams, Url, WorkspaceEdit,
 };
+use num_format::{Locale, ToFormattedString};
 use project_model::TargetKind;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, to_value};
@@ -66,8 +67,8 @@ pub(crate) fn handle_analyzer_status(
         format_to!(
             buf,
             "Loaded {:?} packages across {} workspace{}.\n",
-            snap.workspaces.iter().map(|w| w.n_packages()).sum::<usize>(),
-            snap.workspaces.len(),
+            snap.workspaces.iter().map(|w| w.n_packages()).sum::<usize>().to_formatted_string(&Locale::en),
+            snap.workspaces.len().to_formatted_string(&Locale::en),
             if snap.workspaces.len() == 1 { "" } else { "s" }
         );
     }