Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed Cargo.lock conflict

Browse Source 
Fixed `crossbeam-queue` being referenced  twice in the lockfile
This commit is contained in:
Joshua Barretto
2021-01-07 20:25:12 +00:00
committed by Marcel
parent 1d55dbd217
commit a4b9230f03
43 changed files with 134 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/comp/controller.rs
View File

@ -4,7 +4,7 @@ use crate::{
util::Dir,
};
use serde::{Deserialize, Serialize};
use specs::{Component, FlaggedStorage};
use specs::{Component, DerefFlaggedStorage};
use specs_idvs::IdvStorage;
use std::time::Duration;
use vek::*;
@ -261,12 +261,12 @@ pub enum MountState {
}
impl Component for MountState {
type Storage = FlaggedStorage<Self, IdvStorage<Self>>;
type Storage = DerefFlaggedStorage<Self, IdvStorage<Self>>;
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct Mounting(pub Uid);
impl Component for Mounting {
type Storage = FlaggedStorage<Self, IdvStorage<Self>>;
type Storage = DerefFlaggedStorage<Self, IdvStorage<Self>>;
}