Merge pull request rust-lang#20991 from Veykril/push-rrpwmvnskstu

Merge `text-size` into rust-analyzer

Author: Veykril

src/tools/rust-analyzer/Cargo.lock

@@ -730,7 +730,7 @@ dependencies = [
  "syntax-bridge",
  "test-fixture",
  "test-utils",
- "text-size",
+ "text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "thin-vec",
  "tracing",
  "triomphe",
@@ -1231,7 +1231,7 @@ version = "0.1.2"
 dependencies = [
  "nohash-hasher",
  "oorandom",
- "text-size",
+ "text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1241,7 +1241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e27e0ed5a392a7f5ba0b3808a2afccff16c64933312c84b57618b49d1209bd2"
 dependencies = [
  "nohash-hasher",
- "text-size",
+ "text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2021,7 +2021,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "memoffset",
  "rustc-hash 1.1.0",
- "text-size",
+ "text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2328,6 +2328,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_test"
+version = "1.0.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -2369,7 +2378,7 @@ dependencies = [
  "salsa",
  "stdx",
  "syntax",
- "text-size",
+ "text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "vfs",
 ]
 
@@ -2388,6 +2397,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "stdx"
 version = "0.0.0"
@@ -2497,7 +2512,16 @@ dependencies = [
  "profile",
  "rustc-hash 2.1.1",
  "stdx",
- "text-size",
+ "text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "text-size"
+version = "1.1.1"
+dependencies = [
+ "serde",
+ "serde_test",
+ "static_assertions",
 ]
 
 [[package]]
@@ -2772,7 +2796,7 @@ dependencies = [
  "intern",
  "ra-ap-rustc_lexer",
  "stdx",
- "text-size",
+ "text-size 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]

src/tools/rust-analyzer/lib/text-size/.github/workflows/ci.yaml

@@ -0,0 +1,54 @@
+name: CI
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+    - staging
+    - trying
+
+env:
+  RUSTFLAGS: -D warnings
+  RUSTUP_MAX_RETRIES: 10
+  CARGO_NET_RETRY: 10
+
+jobs:
+  rust:
+    name: Rust
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+
+    - name: Test
+      run: cargo test --all-features
+
+  rustdoc:
+    name: Docs
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: nightly
+        profile: minimal
+        override: true
+
+    - name: Rustdoc
+      run: cargo rustdoc --all-features -- -D warnings

src/tools/rust-analyzer/lib/text-size/.gitignore

@@ -0,0 +1,3 @@
+/target
+**/*.rs.bk
+Cargo.lock

src/tools/rust-analyzer/lib/text-size/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+## 1.1.0
+
+* add `TextRange::ordering` method
+
+## 1.0.0 :tada:
+
+* the carate is renamed to `text-size` from `text_unit`
+
+Transition table:
+- `TextUnit::of_char(c)`                ⟹ `TextSize::of(c)`
+- `TextUnit::of_str(s)`                 ⟹ `TextSize::of(s)`
+- `TextUnit::from_usize(size)`          ⟹ `TextSize::try_from(size).unwrap_or_else(|| panic!(_))`
+- `unit.to_usize()`                     ⟹ `usize::from(size)`
+- `TextRange::from_to(from, to)`        ⟹ `TextRange::new(from, to)`
+- `TextRange::offset_len(offset, size)` ⟹ `TextRange::from_len(offset, size)`
+- `range.start()`                       ⟹ `range.start()`
+- `range.end()`                         ⟹ `range.end()`
+- `range.len()`                         ⟹ `range.len()`
+- `range.is_empty()`                    ⟹ `range.is_empty()`
+- `a.is_subrange(b)`                    ⟹ `b.contains_range(a)`
+- `a.intersection(b)`                   ⟹ `a.intersect(b)`
+- `a.extend_to(b)`                      ⟹ `a.cover(b)`
+- `range.contains(offset)`              ⟹ `range.contains(point)`
+- `range.contains_inclusive(offset)`    ⟹ `range.contains_inclusive(point)`

src/tools/rust-analyzer/lib/text-size/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "text-size"
+version = "1.1.1"
+edition = "2018"
+
+authors = [
+    "Aleksey Kladov <aleksey.kladov@gmail.com>",
+    "Christopher Durham (CAD97) <cad97@cad97.com>"
+]
+description = "Newtypes for text offsets"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/rust-analyzer/text-size"
+documentation = "https://docs.rs/text-size"
+
+[dependencies]
+serde = { version = "1.0", optional = true, default_features = false }
+
+[dev-dependencies]
+serde_test = "1.0"
+static_assertions = "1.1"
+
+[[test]]
+name = "serde"
+path = "tests/serde.rs"
+required-features = ["serde"]