Skip to content

xilem_web: Fix clippy::multiple_bound_locations lints. #216

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
waywardmonkeys merged 1 commit into from
Apr 26, 2024
Merged

xilem_web: Fix clippy::multiple_bound_locations lints. #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions crates/xilem_web/src/vecmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ impl<K, V> VecMap<K, V> {
/// assert_eq!(map.get(&1), Some(&"a"));
/// assert_eq!(map.get(&2), None);
/// ```
pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
pub fn get<Q>(&self, key: &Q) -> Option<&V>
where
K: Borrow<Q> + PartialEq,
Q: PartialEq,
Q: PartialEq + ?Sized,
{
self.0
.iter()
Expand All @@ -60,10 +60,10 @@ impl<K, V> VecMap<K, V> {
/// assert!(map.contains_key(&1));
/// assert!(!map.contains_key(&2));
/// ```
pub fn contains_key<Q: ?Sized>(&self, key: &Q) -> bool
pub fn contains_key<Q>(&self, key: &Q) -> bool
where
K: Borrow<Q> + Ord,
Q: Ord,
Q: Ord + ?Sized,
{
self.get(key).is_some()
}
Expand All @@ -87,10 +87,10 @@ impl<K, V> VecMap<K, V> {
/// assert_eq!(map[&1], "b");
/// ```
// See `get` for implementation notes, this is basically a copy-paste with mut's added
pub fn get_mut<Q: ?Sized>(&mut self, key: &Q) -> Option<&mut V>
pub fn get_mut<Q>(&mut self, key: &Q) -> Option<&mut V>
where
K: Borrow<Q> + Ord,
Q: Ord,
Q: Ord + ?Sized,
{
self.0
.iter_mut()
Expand Down Expand Up @@ -197,10 +197,10 @@ impl<K, V> VecMap<K, V> {
/// assert_eq!(map.remove(&1), Some("a"));
/// assert_eq!(map.remove(&1), None);
/// ```
pub fn remove<Q: ?Sized>(&mut self, key: &Q) -> Option<V>
pub fn remove<Q>(&mut self, key: &Q) -> Option<V>
where
K: Borrow<Q> + Ord,
Q: Ord,
Q: Ord + ?Sized,
{
// TODO not sure whether just a simple find is better here? Probably needs more benching
match self.0.binary_search_by_key(&key, |(k, _)| k.borrow()) {
Expand Down Expand Up @@ -248,10 +248,10 @@ impl<K, V> VecMap<K, V> {
}
}

impl<K, Q: ?Sized, V> Index<&Q> for VecMap<K, V>
impl<K, Q, V> Index<&Q> for VecMap<K, V>
where
K: Borrow<Q> + Ord,
Q: Ord,
Q: Ord + ?Sized,
{
type Output = V;

Expand Down