Pass clippy and rustfmt after merging the parity branches
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -155,9 +155,11 @@ fn run_case(dir: &Path, out: &mut String) -> Result<(), Box<dyn std::error::Erro
|
||||
BanEntry {
|
||||
user,
|
||||
created: date(created).unwrap_or_else(now_millis),
|
||||
source: (source != "-")
|
||||
.then(|| source.to_owned())
|
||||
.unwrap_or_else(|| "(Unknown)".into()),
|
||||
source: if source != "-" {
|
||||
source.to_owned()
|
||||
} else {
|
||||
"(Unknown)".into()
|
||||
},
|
||||
expires: date(expires),
|
||||
reason: (reason != "-").then(|| reason.to_owned()),
|
||||
}
|
||||
|
||||
@@ -692,7 +692,7 @@ impl Game<'_> {
|
||||
// BehaviorUtils.throwItem: from 0.3 below the golem's eyes towards
|
||||
// the player's feet at 0.3 blocks a tick, default pickup delay.
|
||||
let p = self.player.as_ref().map(|p| p.position);
|
||||
let eye = f64::from(self.mobs[index].eye_height());
|
||||
let eye = self.mobs[index].eye_height();
|
||||
let from = [at[0], at[1] + eye - f64::from(0.3f32), at[2]];
|
||||
let v = p.map_or([0.0; 3], |p| {
|
||||
let d = [p.x - at[0], p.y - at[1], p.z - at[2]];
|
||||
|
||||
@@ -1186,7 +1186,7 @@ impl B {
|
||||
};
|
||||
// closerThan(adult, 17) && !closerThan(adult, 3)
|
||||
let d = m.distance_sqr(at.position);
|
||||
if !(d < 17.0 * 17.0 && d >= 3.0 * 3.0) {
|
||||
if !(3.0 * 3.0..17.0 * 17.0).contains(&d) {
|
||||
return false;
|
||||
}
|
||||
let mm = mem(m);
|
||||
@@ -1352,11 +1352,7 @@ impl B {
|
||||
let near =
|
||||
cx.w.target_info(player)
|
||||
.is_some_and(|t| m.distance_sqr(t.position) < close * close);
|
||||
let speed = if brain_mut(m).kind == Kind::Sniffer {
|
||||
1.25
|
||||
} else {
|
||||
1.25
|
||||
};
|
||||
let speed = 1.25;
|
||||
let mm = mem(m);
|
||||
if near {
|
||||
mm.walk_target.clear();
|
||||
|
||||
@@ -159,9 +159,7 @@ impl LineReader<'_> {
|
||||
}
|
||||
if line.is_empty() && (c == '#' || c == '!') {
|
||||
loop {
|
||||
let Some(&d) = chars.get(self.pos) else {
|
||||
return None;
|
||||
};
|
||||
let &d = chars.get(self.pos)?;
|
||||
self.pos += 1;
|
||||
if d == '\r' || d == '\n' {
|
||||
break;
|
||||
|
||||
@@ -353,7 +353,7 @@ fn world_gen_height_and_biome(cx: &mut Cx) {
|
||||
cx.each(Ty::WorldGenSettings, |v| {
|
||||
let flag = v.get("has_increased_height_already").cloned();
|
||||
let was_exp_snap = flag.is_none();
|
||||
let was_previously_increased = flag.as_ref().map_or(true, |f| as_bool(Some(f), true));
|
||||
let was_previously_increased = flag.as_ref().is_none_or(|f| as_bool(Some(f), true));
|
||||
remove(v, "has_increased_height_already");
|
||||
let Some(generator) = v
|
||||
.get_mut("dimensions")
|
||||
|
||||
Reference in New Issue
Block a user