Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot] e0feef8142
build(deps): update cargo_metadata requirement in the cargo-crates group
Updates the requirements on [cargo_metadata](https://github.com/oli-obk/cargo_metadata) to permit the latest version.

Updates `cargo_metadata` to 0.20.0
- [Release notes](https://github.com/oli-obk/cargo_metadata/releases)
- [Changelog](https://github.com/oli-obk/cargo_metadata/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oli-obk/cargo_metadata/compare/0.20.0...0.20.0)

---
updated-dependencies:
- dependency-name: cargo_metadata
  dependency-version: 0.20.0
  dependency-type: direct:production
  dependency-group: cargo-crates
...

Signed-off-by: dependabot[bot] <support@github.com>
2 weeks ago

@ -170,7 +170,7 @@ jobs:
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
- run: cargo install --git https://github.com/aya-rs/bpf-linker.git bpf-linker - run: cargo install --git https://github.com/aya-rs/bpf-linker.git
- uses: taiki-e/install-action@cargo-hack - uses: taiki-e/install-action@cargo-hack
@ -297,7 +297,7 @@ jobs:
# --force so that bpf-linker gets always relinked against the latest LLVM downloaded above. # --force so that bpf-linker gets always relinked against the latest LLVM downloaded above.
# #
# Do this on all system (not just macOS) to avoid relying on rustc-provided libLLVM.so. # Do this on all system (not just macOS) to avoid relying on rustc-provided libLLVM.so.
- run: cargo install --git https://github.com/aya-rs/bpf-linker.git bpf-linker --no-default-features --force - run: cargo install --git https://github.com/aya-rs/bpf-linker.git --no-default-features --force
- uses: actions/cache@v4 - uses: actions/cache@v4
with: with:

@ -151,7 +151,10 @@ impl<T: Log> EbpfLogger<T> {
.ok_or_else(|| Error::MapNotFound)? .ok_or_else(|| Error::MapNotFound)?
.iter() .iter()
.filter_map(|id| MapInfo::from_id(*id).ok()) .filter_map(|id| MapInfo::from_id(*id).ok())
.find(|map_info| map_info.name_as_str() == Some(MAP_NAME)) .find(|map_info| match map_info.name_as_str() {
Some(name) => name == MAP_NAME,
None => false,
})
.ok_or(Error::MapNotFound)?; .ok_or(Error::MapNotFound)?;
let map = MapData::from_id(map.id())?; let map = MapData::from_id(map.id())?;
@ -292,7 +295,7 @@ impl Format for u32 {
Some(DisplayHint::Ip) => Ok(Ipv4Formatter::format(*self)), Some(DisplayHint::Ip) => Ok(Ipv4Formatter::format(*self)),
Some(DisplayHint::LowerMac) => Err(()), Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()), Some(DisplayHint::UpperMac) => Err(()),
None => Ok(DefaultFormatter::format(self)), _ => Ok(DefaultFormatter::format(self)),
} }
} }
} }
@ -348,7 +351,7 @@ impl Format for [u8; 6] {
Some(DisplayHint::Ip) => Err(()), Some(DisplayHint::Ip) => Err(()),
Some(DisplayHint::LowerMac) => Ok(LowerMacFormatter::format(*self)), Some(DisplayHint::LowerMac) => Ok(LowerMacFormatter::format(*self)),
Some(DisplayHint::UpperMac) => Ok(UpperMacFormatter::format(*self)), Some(DisplayHint::UpperMac) => Ok(UpperMacFormatter::format(*self)),
None => Err(()), _ => Err(()),
} }
} }
} }
@ -362,7 +365,7 @@ impl Format for [u8; 16] {
Some(DisplayHint::Ip) => Ok(Ipv6Formatter::format(*self)), Some(DisplayHint::Ip) => Ok(Ipv6Formatter::format(*self)),
Some(DisplayHint::LowerMac) => Err(()), Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()), Some(DisplayHint::UpperMac) => Err(()),
None => Err(()), _ => Err(()),
} }
} }
} }
@ -376,7 +379,7 @@ impl Format for [u16; 8] {
Some(DisplayHint::Ip) => Ok(Ipv6Formatter::format(*self)), Some(DisplayHint::Ip) => Ok(Ipv6Formatter::format(*self)),
Some(DisplayHint::LowerMac) => Err(()), Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()), Some(DisplayHint::UpperMac) => Err(()),
None => Err(()), _ => Err(()),
} }
} }
} }
@ -392,7 +395,7 @@ macro_rules! impl_format {
Some(DisplayHint::Ip) => Err(()), Some(DisplayHint::Ip) => Err(()),
Some(DisplayHint::LowerMac) => Err(()), Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()), Some(DisplayHint::UpperMac) => Err(()),
None => Ok(DefaultFormatter::format(self)), _ => Ok(DefaultFormatter::format(self)),
} }
} }
} }
@ -421,7 +424,7 @@ macro_rules! impl_format_float {
Some(DisplayHint::Ip) => Err(()), Some(DisplayHint::Ip) => Err(()),
Some(DisplayHint::LowerMac) => Err(()), Some(DisplayHint::LowerMac) => Err(()),
Some(DisplayHint::UpperMac) => Err(()), Some(DisplayHint::UpperMac) => Err(()),
None => Ok(DefaultFormatter::format(self)), _ => Ok(DefaultFormatter::format(self)),
} }
} }
} }

Loading…
Cancel
Save