Skip to content

internal: port anymap #15618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 9, 2023
+386 −14
Merged

internal: port anymap #15618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b3257a
refactor: port anymap
shogo-nakano-desu Sep 16, 2023
00e238e
refactor: remove unnecesary cfg_attr and inline macro
shogo-nakano-desu Sep 19, 2023
f671b0b
refactor: move implementation inside anymap crate into stdx crate
shogo-nakano-desu Sep 19, 2023
6212182
refactor: remove hashbrown deps since we can use std
shogo-nakano-desu Sep 19, 2023
2b891ca
chore: add comments to mention anymap is a port from another repo
shogo-nakano-desu Sep 20, 2023
1e11a55
refactor: remove unnecesary deps that are blended in when rebase
shogo-nakano-desu Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ lsp-server = { version = "0.7.4" }

# non-local crates
smallvec = { version = "1.10.0", features = [
"const_new",
"union",
"const_generics",
"const_new",
"union",
"const_generics",
] }
smol_str = "0.2.0"
nohash-hasher = "0.2.0"
Expand All @@ -103,5 +103,5 @@ serde_json = "1.0.96"
triomphe = { version = "0.1.8", default-features = false, features = ["std"] }
# can't upgrade due to dashmap depending on 0.12.3 currently
hashbrown = { version = "0.12.3", features = [
"inline-more",
"inline-more",
], default-features = false }
2 changes: 1 addition & 1 deletion crates/hir-def/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ rust-version.workspace = true
doctest = false

[dependencies]
anymap = "1.0.0-beta.2"
arrayvec = "0.7.2"
bitflags = "2.1.0"
cov-mark = "2.0.0-pre.1"
Expand Down Expand Up @@ -45,6 +44,7 @@ cfg.workspace = true
tt.workspace = true
limit.workspace = true


[dev-dependencies]
expect-test = "1.4.0"

Expand Down
2 changes: 1 addition & 1 deletion crates/hir-def/src/dyn_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ use std::{
ops::{Index, IndexMut},
};

use anymap::Map;
use rustc_hash::FxHashMap;
use stdx::anymap::Map;

pub struct Key<K, V, P = (K, V)> {
_phantom: PhantomData<(K, V, P)>,
Expand Down
1 change: 0 additions & 1 deletion crates/rust-analyzer/tests/slow-tests/tidy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ Apache-2.0 OR MIT
Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
Apache-2.0/MIT
BSD-3-Clause
BlueOak-1.0.0 OR MIT OR Apache-2.0
CC0-1.0
ISC
MIT
Expand Down
Loading