T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change match self to match *self to avoid adding & to all patterns in a match.

Browse Source 
https://rust-lang-nursery.github.io/rust-clippy/v0.0.186/index.html#match_ref_pats
This commit is contained in:
Dan Gohman
2018-02-21 12:42:30 -08:00
parent 234d097f65
commit e943d932b9
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/cretonne/src/bforest/node.rs
View File

@@ -54,8 +54,8 @@ impl<F: Forest> Clone for NodeData<F> {
impl<F: Forest> NodeData<F> { impl<F: Forest> NodeData<F> {
/// Is this a free/unused node? /// Is this a free/unused node?
pub fn is_free(&self) -> bool { pub fn is_free(&self) -> bool {
match self { match *self {
&NodeData::Free { .. } => true, NodeData::Free { .. } => true,
_ => false, _ => false,
} }
} }
@@ -65,10 +65,10 @@ impl<F: Forest> NodeData<F> {
/// This is the number of outgoing edges in an inner node, or the number of key-value pairs in /// This is the number of outgoing edges in an inner node, or the number of key-value pairs in
/// a leaf node. /// a leaf node.
pub fn entries(&self) -> usize { pub fn entries(&self) -> usize {
match self { match *self {
&NodeData::Inner { size, .. } => usize::from(size) + 1, NodeData::Inner { size, .. } => usize::from(size) + 1,
&NodeData::Leaf { size, .. } => usize::from(size), NodeData::Leaf { size, .. } => usize::from(size),
&NodeData::Free { .. } => panic!("freed node"), NodeData::Free { .. } => panic!("freed node"),
} }
} }
@@ -96,8 +96,8 @@ impl<F: Forest> NodeData<F> {
/// Unwrap an inner node into two slices (keys, trees). /// Unwrap an inner node into two slices (keys, trees).
pub fn unwrap_inner(&self) -> (&[F::Key], &[Node]) { pub fn unwrap_inner(&self) -> (&[F::Key], &[Node]) {
match self { match *self {
&NodeData::Inner { NodeData::Inner {
size, size,
ref keys, ref keys,
ref tree, ref tree,
@@ -113,8 +113,8 @@ impl<F: Forest> NodeData<F> {
/// Unwrap a leaf node into two slices (keys, values) of the same length. /// Unwrap a leaf node into two slices (keys, values) of the same length.
pub fn unwrap_leaf(&self) -> (&[F::Key], &[F::Value]) { pub fn unwrap_leaf(&self) -> (&[F::Key], &[F::Value]) {
match self { match *self {
&NodeData::Leaf { NodeData::Leaf {
size, size,
ref keys, ref keys,
ref vals, ref vals,
@@ -132,8 +132,8 @@ impl<F: Forest> NodeData<F> {
/// Unwrap a mutable leaf node into two slices (keys, values) of the same length. /// Unwrap a mutable leaf node into two slices (keys, values) of the same length.
pub fn unwrap_leaf_mut(&mut self) -> (&mut [F::Key], &mut [F::Value]) { pub fn unwrap_leaf_mut(&mut self) -> (&mut [F::Key], &mut [F::Value]) {
match self { match *self {
&mut NodeData::Leaf { NodeData::Leaf {
size, size,
ref mut keys, ref mut keys,
ref mut vals, ref mut vals,
@@ -152,8 +152,8 @@ impl<F: Forest> NodeData<F> {
/// Get the critical key for a leaf node. /// Get the critical key for a leaf node.
/// This is simply the first key. /// This is simply the first key.
pub fn leaf_crit_key(&self) -> F::Key { pub fn leaf_crit_key(&self) -> F::Key {
match self { match *self {
&NodeData::Leaf { size, ref keys, .. } => { NodeData::Leaf { size, ref keys, .. } => {
debug_assert!(size > 0, "Empty leaf node"); debug_assert!(size > 0, "Empty leaf node");
keys.borrow()[0] keys.borrow()[0]
} }
@@ -165,8 +165,8 @@ impl<F: Forest> NodeData<F> {
/// This means that `key` is inserted at `keys[i]` and `node` is inserted at `tree[i + 1]`. /// This means that `key` is inserted at `keys[i]` and `node` is inserted at `tree[i + 1]`.
/// If the node is full, this leaves the node unchanged and returns false. /// If the node is full, this leaves the node unchanged and returns false.
pub fn try_inner_insert(&mut self, index: usize, key: F::Key, node: Node) -> bool { pub fn try_inner_insert(&mut self, index: usize, key: F::Key, node: Node) -> bool {
match self { match *self {
&mut NodeData::Inner { NodeData::Inner {
ref mut size, ref mut size,
ref mut keys, ref mut keys,
ref mut tree, ref mut tree,
@@ -191,8 +191,8 @@ impl<F: Forest> NodeData<F> {
/// Try to insert `key, value` at `index` in a leaf node, but fail and return false if the node /// Try to insert `key, value` at `index` in a leaf node, but fail and return false if the node
/// is full. /// is full.
pub fn try_leaf_insert(&mut self, index: usize, key: F::Key, value: F::Value) -> bool { pub fn try_leaf_insert(&mut self, index: usize, key: F::Key, value: F::Value) -> bool {
match self { match *self {
&mut NodeData::Leaf { NodeData::Leaf {
ref mut size, ref mut size,
ref mut keys, ref mut keys,
ref mut vals, ref mut vals,
@@ -222,8 +222,8 @@ impl<F: Forest> NodeData<F> {
/// The `insert_index` parameter is the position where an insertion was tried and failed. The /// The `insert_index` parameter is the position where an insertion was tried and failed. The
/// node will be split in half with a bias towards an even split after the insertion is retried. /// node will be split in half with a bias towards an even split after the insertion is retried.
pub fn split(&mut self, insert_index: usize) -> SplitOff<F> { pub fn split(&mut self, insert_index: usize) -> SplitOff<F> {
match self { match *self {
&mut NodeData::Inner { NodeData::Inner {
ref mut size, ref mut size,
ref keys, ref keys,
ref tree, ref tree,
@@ -262,7 +262,7 @@ impl<F: Forest> NodeData<F> {
}, },
} }
} }
&mut NodeData::Leaf { NodeData::Leaf {
ref mut size, ref mut size,
ref keys, ref keys,
ref vals, ref vals,
@@ -307,8 +307,8 @@ impl<F: Forest> NodeData<F> {
/// ///
/// Return an indication of the node's health (i.e. below half capacity). /// Return an indication of the node's health (i.e. below half capacity).
pub fn inner_remove(&mut self, index: usize) -> Removed { pub fn inner_remove(&mut self, index: usize) -> Removed {
match self { match *self {
&mut NodeData::Inner { NodeData::Inner {
ref mut size, ref mut size,
ref mut keys, ref mut keys,
ref mut tree, ref mut tree,
@@ -332,8 +332,8 @@ impl<F: Forest> NodeData<F> {
/// ///
/// Return an indication of the node's health (i.e. below half capacity). /// Return an indication of the node's health (i.e. below half capacity).
pub fn leaf_remove(&mut self, index: usize) -> Removed { pub fn leaf_remove(&mut self, index: usize) -> Removed {
match self { match *self {
&mut NodeData::Leaf { NodeData::Leaf {
ref mut size, ref mut size,
ref mut keys, ref mut keys,
ref mut vals, ref mut vals,
@@ -553,15 +553,15 @@ where
F::Value: ValDisp, F::Value: ValDisp,
{ {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match *self {
&NodeData::Inner { size, keys, tree } => { NodeData::Inner { size, keys, tree } => {
write!(f, "[ {}", tree[0])?; write!(f, "[ {}", tree[0])?;
for i in 0..usize::from(size) { for i in 0..usize::from(size) {
write!(f, " {} {}", keys[i], tree[i + 1])?; write!(f, " {} {}", keys[i], tree[i + 1])?;
} }
write!(f, " ]") write!(f, " ]")
} }
&NodeData::Leaf { size, keys, vals } => { NodeData::Leaf { size, keys, vals } => {
let keys = keys.borrow(); let keys = keys.borrow();
let vals = vals.borrow(); let vals = vals.borrow();
write!(f, "[")?; write!(f, "[")?;
@@ -571,8 +571,8 @@ where
} }
write!(f, " ]") write!(f, " ]")
} }
&NodeData::Free { next: Some(n) } => write!(f, "[ free -> {} ]", n), NodeData::Free { next: Some(n) } => write!(f, "[ free -> {} ]", n),
&NodeData::Free { next: None } => write!(f, "[ free ]"), NodeData::Free { next: None } => write!(f, "[ free ]"),
} }
} }
} }