From d6bb3c46edb49dea2afd63b49728c7cbdf9d62d2 Mon Sep 17 00:00:00 2001
From: Addison Crump <addison.crump@cispa.de>
Date: Wed, 2 Aug 2023 13:38:33 +0200
Subject: [PATCH] sym => symbol

---
 aya/src/maps/stack_trace.rs | 4 ++--
 aya/src/util.rs             | 4 ++--
 xtask/public-api/aya.txt    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aya/src/maps/stack_trace.rs b/aya/src/maps/stack_trace.rs
index 7c3c7c94..4ccb0ee1 100644
--- a/aya/src/maps/stack_trace.rs
+++ b/aya/src/maps/stack_trace.rs
@@ -162,7 +162,7 @@ impl<'a, T: Borrow<MapData>> IntoIterator for &'a StackTraceMap<T> {
 /// A resolver for symbols based on an address obtained from a stack trace.
 pub trait SymbolResolver {
     /// Resolve a symbol for a given address, if possible.
-    fn resolve_sym(&self, addr: u64) -> Option<&str>;
+    fn resolve_symbol(&self, addr: u64) -> Option<&str>;
 }
 
 /// A kernel or user space stack trace.
@@ -182,7 +182,7 @@ impl StackTrace {
     /// them from debug info.
     pub fn resolve<R: SymbolResolver>(&mut self, symbols: &R) -> &StackTrace {
         for frame in self.frames.iter_mut() {
-            frame.symbol_name = symbols.resolve_sym(frame.ip).map(|s| s.to_string())
+            frame.symbol_name = symbols.resolve_symbol(frame.ip).map(|s| s.to_string())
         }
 
         self
diff --git a/aya/src/util.rs b/aya/src/util.rs
index 12f7c253..a7b8b876 100644
--- a/aya/src/util.rs
+++ b/aya/src/util.rs
@@ -11,10 +11,10 @@ use std::{
 
 use crate::{
     generated::{TC_H_MAJ_MASK, TC_H_MIN_MASK},
+    maps::stack_trace::SymbolResolver,
     Pod,
 };
 
-use crate::maps::stack_trace::SymbolResolver;
 use libc::{if_nametoindex, sysconf, uname, utsname, _SC_PAGESIZE};
 
 /// Represents a kernel version, in major.minor.release version.
@@ -206,7 +206,7 @@ fn parse_cpu_ranges(data: &str) -> Result<Vec<u32>, ()> {
 pub type SimpleSymbolResolver = BTreeMap<u64, String>;
 
 impl SymbolResolver for SimpleSymbolResolver {
-    fn resolve_sym(&self, addr: u64) -> Option<&str> {
+    fn resolve_symbol(&self, addr: u64) -> Option<&str> {
         self.range(..=addr).next_back().map(|(_, s)| s.as_str())
     }
 }
diff --git a/xtask/public-api/aya.txt b/xtask/public-api/aya.txt
index 9f39b46f..a0475bb0 100644
--- a/xtask/public-api/aya.txt
+++ b/xtask/public-api/aya.txt
@@ -804,9 +804,9 @@ pub fn aya::maps::stack_trace::StackTraceMap<T>::borrow_mut(&mut self) -> &mut T
 impl<T> core::convert::From<T> for aya::maps::stack_trace::StackTraceMap<T>
 pub fn aya::maps::stack_trace::StackTraceMap<T>::from(t: T) -> T
 pub trait aya::maps::stack_trace::SymbolResolver
-pub fn aya::maps::stack_trace::SymbolResolver::resolve_sym(&self, addr: u64) -> core::option::Option<&str>
+pub fn aya::maps::stack_trace::SymbolResolver::resolve_symbol(&self, addr: u64) -> core::option::Option<&str>
 impl aya::maps::stack_trace::SymbolResolver for aya::util::SimpleSymbolResolver
-pub fn aya::util::SimpleSymbolResolver::resolve_sym(&self, addr: u64) -> core::option::Option<&str>
+pub fn aya::util::SimpleSymbolResolver::resolve_symbol(&self, addr: u64) -> core::option::Option<&str>
 pub enum aya::maps::Map
 pub aya::maps::Map::Array(aya::maps::MapData)
 pub aya::maps::Map::BloomFilter(aya::maps::MapData)