From 3a4e3087ea0abb7df0781a5a2c0e49bf3234d610 Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Thu, 6 Jul 2023 18:38:27 -0700 Subject: [PATCH] Try turning && to & --- src/symbolize/gimli/elf.rs | 8 ++++---- src/symbolize/gimli/parse_running_mmaps_unix.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/symbolize/gimli/elf.rs b/src/symbolize/gimli/elf.rs index b0eec0762..ad855373c 100644 --- a/src/symbolize/gimli/elf.rs +++ b/src/symbolize/gimli/elf.rs @@ -201,7 +201,7 @@ impl<'a> Object<'a> { .iter() .filter_map(|header| { let name = self.sections.section_name(self.endian, header).ok()?; - if name.starts_with(b".zdebug_") && &name[8..] == debug_name { + if name.starts_with(b".zdebug_") & (&name[8..] == debug_name) { Some(header) } else { None @@ -231,7 +231,7 @@ impl<'a> Object<'a> { Err(i) => i.checked_sub(1)?, }; let sym = self.syms.get(i)?; - if sym.address <= addr && addr <= sym.address + sym.size { + if (sym.address <= addr) & (addr <= sym.address + sym.size) { self.strings.get(sym.name).ok() } else { None @@ -246,7 +246,7 @@ impl<'a> Object<'a> { for section in self.sections.iter() { if let Ok(Some(mut notes)) = section.notes(self.endian, self.data) { while let Ok(Some(note)) = notes.next() { - if note.name() == ELF_NOTE_GNU && note.n_type(self.endian) == NT_GNU_BUILD_ID { + if (note.name() == ELF_NOTE_GNU) & (note.n_type(self.endian) == NT_GNU_BUILD_ID) { return Some(note.desc()); } } @@ -297,7 +297,7 @@ fn decompress_zlib(input: &[u8], output: &mut [u8]) -> Option<()> { 0, TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | TINFL_FLAG_PARSE_ZLIB_HEADER, ); - if status == TINFLStatus::Done && in_read == input.len() && out_read == output.len() { + if (status == TINFLStatus::Done) & (in_read == input.len()) & (out_read == output.len()) { Some(()) } else { None diff --git a/src/symbolize/gimli/parse_running_mmaps_unix.rs b/src/symbolize/gimli/parse_running_mmaps_unix.rs index b51476df9..0a95833eb 100644 --- a/src/symbolize/gimli/parse_running_mmaps_unix.rs +++ b/src/symbolize/gimli/parse_running_mmaps_unix.rs @@ -77,7 +77,7 @@ impl MapsEntry { #[inline] pub(super) fn ip_matches(&self, ip: usize) -> bool { - self.address.0 <= ip && ip < self.address.1 + (self.address.0 <= ip) & (ip < self.address.1) } }