Skip to content

Apply 1.60 clippy lints and apply variable name #544

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
Defman merged 2 commits into from
Jun 17, 2022
Merged

Apply 1.60 clippy lints and apply variable name #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc4875b
FIx clippy 1.60 lints
FussballAndy Apr 19, 2022
b5c4a46
cargo fmt
FussballAndy Apr 19, 2022
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
19 changes: 9 additions & 10 deletions feather/base/src/anvil/player.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,17 @@ pub struct InventorySlot {

impl InventorySlot {
/// Converts an [`ItemStack`] and network protocol index into an [`InventorySlot`].
pub fn from_network_index(network: usize, stack: &ItemStack) -> Option<Self> {
let slot = if SLOT_HOTBAR_OFFSET <= network && network < SLOT_HOTBAR_OFFSET + HOTBAR_SIZE {
#[allow(clippy::manual_range_contains)]
pub fn from_network_index(index: usize, stack: &ItemStack) -> Option<Self> {
let slot = if SLOT_HOTBAR_OFFSET <= index && index < SLOT_HOTBAR_OFFSET + HOTBAR_SIZE {
// Hotbar
(network - SLOT_HOTBAR_OFFSET) as i8
} else if network == SLOT_OFFHAND {
(index - SLOT_HOTBAR_OFFSET) as i8
} else if index == SLOT_OFFHAND {
-106
} else if SLOT_ARMOR_MIN <= network && network <= SLOT_ARMOR_MAX {
((SLOT_ARMOR_MAX - network) + 100) as i8
} else if SLOT_INVENTORY_OFFSET <= network
&& network < SLOT_INVENTORY_OFFSET + INVENTORY_SIZE
{
network as i8
} else if SLOT_ARMOR_MIN <= index && index <= SLOT_ARMOR_MAX {
((SLOT_ARMOR_MAX - index) + 100) as i8
} else if SLOT_INVENTORY_OFFSET <= index && index < SLOT_INVENTORY_OFFSET + INVENTORY_SIZE {
index as i8
} else {
return None;
};
Expand Down
6 changes: 3 additions & 3 deletions feather/worldgen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ impl NearbyBiomes {
let chunk_x = (x / 16) as usize;
let chunk_z = (z / 16) as usize;

let mut local_x = (ox % 16).abs() as usize;
let local_y = (oy % 16).abs() as usize;
let mut local_z = (oz % 16).abs() as usize;
let mut local_x = (ox % 16).unsigned_abs();
let local_y = (oy % 16).unsigned_abs();
let mut local_z = (oz % 16).unsigned_abs();

if ox < 0 {
local_x = 16 - local_x;
Expand Down
2 changes: 1 addition & 1 deletion libcraft/items/src/item_stack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ pub enum ItemStackError {

impl Display for ItemStackError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self)
write!(f, "{:?}", self)
}
}

Expand Down