update changelog, clippy fixes

This commit is contained in:
Imbris 2021-03-16 03:56:43 -04:00
parent f2ff5c9655
commit 8d9809ed25
7 changed files with 14 additions and 18 deletions

View File

@ -76,6 +76,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Changed sunlight (and, in general, static light) propagation through blocks to allow for more material properties - Changed sunlight (and, in general, static light) propagation through blocks to allow for more material properties
- Overhauled the sceptre - Overhauled the sceptre
- Make the /time command relative to the current day - Make the /time command relative to the current day
- Spatial partitioning via a grid for entity versus entity collisions was added which can more than halve the total tick time at higher entity counts (> ~1000)
### Removed ### Removed

1
Cargo.lock generated
View File

@ -5633,7 +5633,6 @@ dependencies = [
"bincode", "bincode",
"hashbrown", "hashbrown",
"indexmap", "indexmap",
"inline_tweak",
"rand 0.8.3", "rand 0.8.3",
"rayon", "rayon",
"scopeguard", "scopeguard",

View File

@ -244,7 +244,6 @@ impl Client {
ping_stream.send(PingMsg::Ping)?; ping_stream.send(PingMsg::Ping)?;
let mut ping_interval = tokio::time::interval(core::time::Duration::from_secs(1));
// Wait for initial sync // Wait for initial sync
let mut ping_interval = tokio::time::interval(core::time::Duration::from_secs(1)); let mut ping_interval = tokio::time::interval(core::time::Duration::from_secs(1));
let ( let (

View File

@ -58,6 +58,8 @@ macro_rules! span {
}; };
} }
pub struct DummySpan;
/// Like the span macro but only used when profiling and not in regular tracing /// Like the span macro but only used when profiling and not in regular tracing
/// operations /// operations
#[macro_export] #[macro_export]
@ -73,7 +75,7 @@ macro_rules! prof_span {
0, 0,
); );
#[cfg(not(feature = "tracy"))] #[cfg(not(feature = "tracy"))]
let $guard_name = (); let $guard_name = $crate::DummySpan;
}; };
} }

View File

@ -42,4 +42,4 @@ bincode = { version = "1.3.1", optional = true }
plugin-api = { package = "veloren-plugin-api", path = "../../plugin/api", optional = true } plugin-api = { package = "veloren-plugin-api", path = "../../plugin/api", optional = true }
# Tweak running code # Tweak running code
inline_tweak = { version = "1.0.8", features = ["release_tweak"] } # inline_tweak = { version = "1.0.8", features = ["release_tweak"] }

View File

@ -1,4 +1,5 @@
#![feature(label_break_value, bool_to_option, option_unwrap_none)] #![feature(label_break_value, bool_to_option, option_unwrap_none)]
#![allow(clippy::option_map_unit_fn)]
mod aura; mod aura;
mod beam; mod beam;

View File

@ -885,20 +885,14 @@ impl<'a> PhysicsData<'a> {
land_on_ground land_on_ground
}, },
) )
.fold( .fold(Vec::new, |mut land_on_grounds, land_on_ground| {
|| Vec::new(), land_on_ground.map(|log| land_on_grounds.push(log));
|mut land_on_grounds, land_on_ground| { land_on_grounds
land_on_ground.map(|log| land_on_grounds.push(log)); })
land_on_grounds .reduce(Vec::new, |mut land_on_grounds_a, mut land_on_grounds_b| {
}, land_on_grounds_a.append(&mut land_on_grounds_b);
) land_on_grounds_a
.reduce( });
|| Vec::new(),
|mut land_on_grounds_a, mut land_on_grounds_b| {
land_on_grounds_a.append(&mut land_on_grounds_b);
land_on_grounds_a
},
);
drop(guard); drop(guard);
job.cpu_stats.measure(ParMode::Single); job.cpu_stats.measure(ParMode::Single);