Skip to content

Commit aaa1e8e

Browse files
committed
Auto merge of #15618 - shogo-nakano-desu:internal/port-anymap, r=Veykril
internal: port anymap ## Description - The anymap crate has been ported. During this process, unnecessary features for rust-analyzer have been removed. - From the tests that were checking the existing licenses, the anymap license (`BlueOak-1.0.0 OR MIT OR Apache-2.0`) has been removed. ## Requests - While porting the code this time, I have tried to respect the original author's intentions and have kept the comments/codes as much as possible. Please don't hesitate to tell me if you think the comments/codes also need to be appropriately modified. - If there are any necessary changes regarding the licensing or anything else, please let me know so I can fix them. ## Issue rust-lang/rust-analyzer#15500
2 parents ab62c01 + 1e11a55 commit aaa1e8e

File tree

7 files changed

+386
-14
lines changed

7 files changed

+386
-14
lines changed

Cargo.lock

-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ lsp-server = { version = "0.7.4" }
9191

9292
# non-local crates
9393
smallvec = { version = "1.10.0", features = [
94-
"const_new",
95-
"union",
96-
"const_generics",
94+
"const_new",
95+
"union",
96+
"const_generics",
9797
] }
9898
smol_str = "0.2.0"
9999
nohash-hasher = "0.2.0"
@@ -103,5 +103,5 @@ serde_json = "1.0.96"
103103
triomphe = { version = "0.1.8", default-features = false, features = ["std"] }
104104
# can't upgrade due to dashmap depending on 0.12.3 currently
105105
hashbrown = { version = "0.12.3", features = [
106-
"inline-more",
106+
"inline-more",
107107
], default-features = false }

crates/hir-def/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ rust-version.workspace = true
1212
doctest = false
1313

1414
[dependencies]
15-
anymap = "1.0.0-beta.2"
1615
arrayvec = "0.7.2"
1716
bitflags = "2.1.0"
1817
cov-mark = "2.0.0-pre.1"
@@ -45,6 +44,7 @@ cfg.workspace = true
4544
tt.workspace = true
4645
limit.workspace = true
4746

47+
4848
[dev-dependencies]
4949
expect-test = "1.4.0"
5050

crates/hir-def/src/dyn_map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ use std::{
2929
ops::{Index, IndexMut},
3030
};
3131

32-
use anymap::Map;
3332
use rustc_hash::FxHashMap;
33+
use stdx::anymap::Map;
3434

3535
pub struct Key<K, V, P = (K, V)> {
3636
_phantom: PhantomData<(K, V, P)>,

crates/rust-analyzer/tests/slow-tests/tidy.rs

-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ Apache-2.0 OR MIT
157157
Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
158158
Apache-2.0/MIT
159159
BSD-3-Clause
160-
BlueOak-1.0.0 OR MIT OR Apache-2.0
161160
CC0-1.0
162161
ISC
163162
MIT

0 commit comments

Comments
 (0)