Skip to content

Commit f7e357c

Browse files
author
Andrew Gazelka
committed
fmt
1 parent 721275e commit f7e357c

File tree

51 files changed

+93
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+93
-110
lines changed

vendor/valence/crates/java_string/src/pattern.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -167,21 +167,13 @@ where
167167
#[inline]
168168
fn prefix_len_in(&mut self, haystack: &JavaStr) -> Option<usize> {
169169
let ch = haystack.chars().next()?;
170-
if self(ch) {
171-
Some(ch.len_utf8())
172-
} else {
173-
None
174-
}
170+
if self(ch) { Some(ch.len_utf8()) } else { None }
175171
}
176172

177173
#[inline]
178174
fn suffix_len_in(&mut self, haystack: &JavaStr) -> Option<usize> {
179175
let ch = haystack.chars().next_back()?;
180-
if self(ch) {
181-
Some(ch.len_utf8())
182-
} else {
183-
None
184-
}
176+
if self(ch) { Some(ch.len_utf8()) } else { None }
185177
}
186178

187179
#[inline]

vendor/valence/crates/valence_anvil/src/parsing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use valence_server::block::{PropName, PropValue};
88
use valence_server::layer::chunk::{Chunk, UnloadedChunk};
99
use valence_server::nbt::{Compound, List, Value};
1010
use valence_server::protocol::BlockKind;
11-
use valence_server::registry::biome::BiomeId;
1211
use valence_server::registry::BiomeRegistry;
12+
use valence_server::registry::biome::BiomeId;
1313
use valence_server::{ChunkPos, Ident};
1414

1515
use crate::{RegionError, RegionFolder};

vendor/valence/crates/valence_entity/src/attributes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use bevy_ecs::prelude::*;
44
use indexmap::IndexMap;
55
use uuid::Uuid;
66
pub use valence_generated::attributes::{EntityAttribute, EntityAttributeOperation};
7-
use valence_protocol::packets::play::entity_attributes_s2c::*;
87
use valence_protocol::Ident;
8+
use valence_protocol::packets::play::entity_attributes_s2c::*;
99

1010
/// An instance of an Entity Attribute.
1111
#[derive(Component, Clone, PartialEq, Debug)]

vendor/valence/crates/valence_entity/src/hitbox.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,7 @@ fn update_armor_stand_hitbox(
276276
}
277277

278278
fn child_hitbox(child: bool, v: DVec3) -> DVec3 {
279-
if child {
280-
v / 2.0
281-
} else {
282-
v
283-
}
279+
if child { v / 2.0 } else { v }
284280
}
285281

286282
fn update_passive_child_hitbox(

vendor/valence/crates/valence_entity/src/query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use bevy_ecs::prelude::DetectChanges;
44
use bevy_ecs::query::WorldQuery;
55
use bevy_ecs::world::Ref;
66
use valence_math::DVec3;
7+
use valence_protocol::ByteAngle;
78
use valence_protocol::encode::WritePacket;
89
use valence_protocol::packets::play::{
910
EntityAnimationS2c, EntityAttributesS2c, EntityPositionS2c, EntitySetHeadYawS2c,
1011
EntitySpawnS2c, EntityStatusS2c, EntityVelocityUpdateS2c, ExperienceOrbSpawnS2c,
1112
MoveRelativeS2c, PlayerSpawnS2c, RotateAndMoveRelativeS2c, RotateS2c,
1213
};
1314
use valence_protocol::var_int::VarInt;
14-
use valence_protocol::ByteAngle;
1515
use valence_server_common::UniqueId;
1616

1717
use crate::attributes::TrackedEntityAttributes;

vendor/valence/crates/valence_generated/build/block.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::collections::BTreeSet;
22

33
use heck::{ToPascalCase, ToShoutySnakeCase};
44
use proc_macro2::TokenStream;
5-
use quote::{quote, ToTokens};
5+
use quote::{ToTokens, quote};
66
use serde::Deserialize;
77
use valence_build_utils::{ident, rerun_if_changed};
88

vendor/valence/crates/valence_generated/src/block.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::fmt;
44
use std::fmt::Display;
55
use std::iter::FusedIterator;
66

7-
use valence_ident::{ident, Ident};
7+
use valence_ident::{Ident, ident};
88

99
use crate::item::ItemKind;
1010

vendor/valence/crates/valence_ident_macros/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use proc_macro::TokenStream as StdTokenStream;
44
use proc_macro2::TokenStream;
55
use quote::quote;
6-
use syn::{parse2, Error, LitStr, Result};
6+
use syn::{Error, LitStr, Result, parse2};
77

88
#[proc_macro]
99
pub fn parse_ident_str(item: StdTokenStream) -> StdTokenStream {

vendor/valence/crates/valence_math/src/aabb.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,7 @@ impl Aabb {
125125
far = far.min(t0.max(t1));
126126
}
127127

128-
if near <= far {
129-
Some([near, far])
130-
} else {
131-
None
132-
}
128+
if near <= far { Some([near, far]) } else { None }
133129
}
134130
}
135131

vendor/valence/crates/valence_nbt/src/binary.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//! # Examples
55
//!
66
//! ```
7-
//! use valence_nbt::{compound, to_binary, Compound, List};
7+
//! use valence_nbt::{Compound, List, compound, to_binary};
88
//!
99
//! let c = compound! {
1010
//! "byte" => 5_i8,
@@ -24,7 +24,7 @@
2424
//! Decode NBT data from its binary form.
2525
//!
2626
//! ```
27-
//! use valence_nbt::{compound, from_binary, Compound};
27+
//! use valence_nbt::{Compound, compound, from_binary};
2828
//!
2929
//! let some_bytes = [10, 0, 0, 3, 0, 3, 105, 110, 116, 0, 0, 222, 173, 0];
3030
//!
@@ -45,8 +45,8 @@ mod modified_utf8;
4545
#[cfg(test)]
4646
mod tests;
4747

48-
pub use decode::{from_binary, FromModifiedUtf8, FromModifiedUtf8Error};
49-
pub use encode::{to_binary, written_size, ToModifiedUtf8};
48+
pub use decode::{FromModifiedUtf8, FromModifiedUtf8Error, from_binary};
49+
pub use encode::{ToModifiedUtf8, to_binary, written_size};
5050
pub use error::*;
5151

5252
use crate::Tag;

0 commit comments

Comments
 (0)