diff --git a/src/rs/file.rs b/src/rs/file.rs index 49a3fd5..2999aa1 100644 --- a/src/rs/file.rs +++ b/src/rs/file.rs @@ -270,7 +270,7 @@ pub(crate) mod python_bindings { #[pymethods] impl super::File { #[new] - pub fn py_new( + fn py_new( filepath: PathBuf, vram: u64, size: u64, @@ -370,7 +370,7 @@ pub(crate) mod python_bindings { */ #[getter] - pub fn isNoloadSection(&self) -> bool { + fn isNoloadSection(&self) -> bool { self.is_noload_section() } @@ -385,11 +385,11 @@ pub(crate) mod python_bindings { .collect() } - pub fn findSymbolByName(&self, sym_name: &str) -> Option { + fn findSymbolByName(&self, sym_name: &str) -> Option { self.find_symbol_by_name(sym_name).cloned() } - pub fn findSymbolByVramOrVrom(&self, address: u64) -> Option<(symbol::Symbol, i64)> { + fn findSymbolByVramOrVrom(&self, address: u64) -> Option<(symbol::Symbol, i64)> { if let Some((sym, offset)) = self.find_symbol_by_vram_or_vrom(address) { Some((sym.clone(), offset)) } else { @@ -399,23 +399,23 @@ pub(crate) mod python_bindings { #[staticmethod] #[pyo3(signature=(print_vram=true))] - pub fn toCsvHeader(print_vram: bool) -> String { + fn toCsvHeader(print_vram: bool) -> String { Self::to_csv_header(print_vram) } #[pyo3(signature=(print_vram=true))] - pub fn toCsv(&self, print_vram: bool) -> String { + fn toCsv(&self, print_vram: bool) -> String { self.to_csv(print_vram) } #[staticmethod] #[pyo3(signature=(print_vram=true))] - pub fn printCsvHeader(print_vram: bool) { + fn printCsvHeader(print_vram: bool) { Self::print_csv_header(print_vram) } #[pyo3(signature=(print_vram=true))] - pub fn printAsCsv(&self, print_vram: bool) { + fn printAsCsv(&self, print_vram: bool) { self.print_as_csv(print_vram) } diff --git a/src/rs/found_symbol_info.rs b/src/rs/found_symbol_info.rs index 2a782e0..6ed876d 100644 --- a/src/rs/found_symbol_info.rs +++ b/src/rs/found_symbol_info.rs @@ -74,7 +74,7 @@ pub(crate) mod python_bindings { impl super::FoundSymbolInfo { #[new] #[pyo3(signature=(file, symbol, offset=0))] - pub fn py_new(file: file::File, symbol: symbol::Symbol, offset: i64) -> Self { + fn py_new(file: file::File, symbol: symbol::Symbol, offset: i64) -> Self { Self::new(file, symbol, offset) } @@ -116,12 +116,12 @@ pub(crate) mod python_bindings { /* Methods */ #[pyo3(name = "getAsStr")] - pub fn getAsStr(&self) -> String { + fn getAsStr(&self) -> String { self.get_as_str() } #[pyo3(name = "getAsStrPlusOffset")] - pub fn getAsStrPlusOffset(&self, sym_name: Option) -> String { + fn getAsStrPlusOffset(&self, sym_name: Option) -> String { self.get_as_str_plus_offset(sym_name) } } diff --git a/src/rs/mapfile.rs b/src/rs/mapfile.rs index aa58c34..7ed5bb4 100644 --- a/src/rs/mapfile.rs +++ b/src/rs/mapfile.rs @@ -802,24 +802,24 @@ pub(crate) mod python_bindings { #[pymethods] impl super::MapFile { #[new] - pub fn py_new() -> Self { + fn py_new() -> Self { Self::new() } #[staticmethod] - pub fn newFromMapFile(map_path: PathBuf) -> Self { + fn newFromMapFile(map_path: PathBuf) -> Self { Self::new_from_map_file(&map_path) } - pub fn readMapFile(&mut self, map_path: PathBuf) { + fn readMapFile(&mut self, map_path: PathBuf) { self.read_map_file(&map_path) } - pub fn parseMapContents(&mut self, map_contents: &str) { + fn parseMapContents(&mut self, map_contents: &str) { self.parse_map_contents(map_contents) } - pub fn parseMapContentsGNU(&mut self, map_contents: &str) { + fn parseMapContentsGNU(&mut self, map_contents: &str) { self.parse_map_contents_gnu(map_contents) } @@ -829,33 +829,33 @@ pub(crate) mod python_bindings { The `mapContents` argument must contain the contents of a clang ld.lld mapfile. */ #[pyo3(name = "parseMapContentsLLD")] - pub fn parseMapContentsLLD(&mut self, map_contents: &str) { + fn parseMapContentsLLD(&mut self, map_contents: &str) { self.parse_map_contents_lld(map_contents) } - pub fn filterBySectionType(&self, section_type: &str) -> Self { + fn filterBySectionType(&self, section_type: &str) -> Self { self.filter_by_section_type(section_type) } - pub fn getEveryFileExceptSectionType(&self, section_type: &str) -> Self { + fn getEveryFileExceptSectionType(&self, section_type: &str) -> Self { self.get_every_file_except_section_type(section_type) } - pub fn findSymbolByName( + fn findSymbolByName( &self, sym_name: &str, ) -> Option { self.find_symbol_by_name(sym_name) } - pub fn findSymbolByVramOrVrom( + fn findSymbolByVramOrVrom( &self, address: u64, ) -> Option { self.find_symbol_by_vram_or_vrom(address) } - pub fn findLowestDifferingSymbol( + fn findLowestDifferingSymbol( &self, other_map_file: &Self, ) -> Option<(symbol::Symbol, file::File, Option)> { @@ -866,12 +866,12 @@ pub(crate) mod python_bindings { } } - pub fn mixFolders(&self) -> Self { + fn mixFolders(&self) -> Self { self.mix_folders() } #[pyo3(signature = (asm_path, nonmatchings, aliases=HashMap::new(), path_index=2))] - pub fn getProgress( + fn getProgress( &self, asm_path: PathBuf, nonmatchings: PathBuf, @@ -885,7 +885,7 @@ pub(crate) mod python_bindings { } #[pyo3(signature=(other_map_file, *, check_other_on_self=true))] - pub fn compareFilesAndSymbols( + fn compareFilesAndSymbols( &self, other_map_file: &Self, check_other_on_self: bool, @@ -894,20 +894,20 @@ pub(crate) mod python_bindings { } #[pyo3(signature=(print_vram=true, skip_without_symbols=true))] - pub fn toCsv(&self, print_vram: bool, skip_without_symbols: bool) -> String { + fn toCsv(&self, print_vram: bool, skip_without_symbols: bool) -> String { self.to_csv(print_vram, skip_without_symbols) } - pub fn toCsvSymbols(&self) -> String { + fn toCsvSymbols(&self) -> String { self.to_csv_symbols() } #[pyo3(signature=(print_vram=true, skip_without_symbols=true))] - pub fn printAsCsv(&self, print_vram: bool, skip_without_symbols: bool) { + fn printAsCsv(&self, print_vram: bool, skip_without_symbols: bool) { self.print_as_csv(print_vram, skip_without_symbols) } - pub fn printSymbolsCsv(&self) { + fn printSymbolsCsv(&self) { self.print_symbols_csv() } diff --git a/src/rs/maps_comparison_info.rs b/src/rs/maps_comparison_info.rs index 6cedd2c..6dce8fd 100644 --- a/src/rs/maps_comparison_info.rs +++ b/src/rs/maps_comparison_info.rs @@ -46,7 +46,7 @@ pub(crate) mod python_bindings { #[pymethods] impl super::MapsComparisonInfo { #[new] - pub fn py_new() -> Self { + fn py_new() -> Self { Self::new() } diff --git a/src/rs/progress_stats.rs b/src/rs/progress_stats.rs index 7e0e48d..14eb4b0 100644 --- a/src/rs/progress_stats.rs +++ b/src/rs/progress_stats.rs @@ -109,7 +109,7 @@ pub(crate) mod python_bindings { #[pymethods] impl super::ProgressStats { #[new] - pub fn py_new() -> Self { + fn py_new() -> Self { Self::new() } @@ -139,7 +139,7 @@ pub(crate) mod python_bindings { #[getter] #[pyo3(name = "total")] - pub fn py_total(&self) -> usize { + fn py_total(&self) -> usize { self.total() } @@ -161,24 +161,24 @@ pub(crate) mod python_bindings { self.decomped_percentage_total(total_stats) } - pub fn getAsFrogressEntry(&self, name: &str) -> HashMap { + fn getAsFrogressEntry(&self, name: &str) -> HashMap { self.get_as_frogress_entry(name) } #[staticmethod] #[pyo3(signature=(category_column_size=28))] - pub fn getHeaderAsStr(category_column_size: usize) -> String { + fn getHeaderAsStr(category_column_size: usize) -> String { Self::get_header_as_str(category_column_size) } #[staticmethod] #[pyo3(signature=(category_column_size=28))] - pub fn printHeader(category_column_size: usize) { + fn printHeader(category_column_size: usize) { Self::print_header(category_column_size) } #[pyo3(signature=(category, total_stats, category_column_size=28))] - pub fn getEntryAsStr( + fn getEntryAsStr( &self, category: &str, total_stats: &Self, @@ -189,7 +189,7 @@ pub(crate) mod python_bindings { #[pyo3(name = "print")] #[pyo3(signature=(category, total_stats, category_column_size=28))] - pub fn py_print(&self, category: &str, total_stats: &Self, category_column_size: usize) { + fn py_print(&self, category: &str, total_stats: &Self, category_column_size: usize) { self.print(category, total_stats, category_column_size) } } diff --git a/src/rs/segment.rs b/src/rs/segment.rs index ef3e6ea..5871636 100644 --- a/src/rs/segment.rs +++ b/src/rs/segment.rs @@ -286,7 +286,7 @@ pub(crate) mod python_bindings { #[pymethods] impl super::Segment { #[new] - pub fn py_new(name: String, vram: u64, size: u64, vrom: u64, align: Option) -> Self { + fn py_new(name: String, vram: u64, size: u64, vrom: u64, align: Option) -> Self { Self::new(name, vram, size, vrom, align) } @@ -362,47 +362,47 @@ pub(crate) mod python_bindings { /* Methods */ - pub fn filterBySectionType(&self, section_type: &str) -> Self { + fn filterBySectionType(&self, section_type: &str) -> Self { self.filter_by_section_type(section_type) } - pub fn getEveryFileExceptSectionType(&self, section_type: &str) -> Self { + fn getEveryFileExceptSectionType(&self, section_type: &str) -> Self { self.get_every_file_except_section_type(section_type) } - pub fn findSymbolByName( + fn findSymbolByName( &self, sym_name: &str, ) -> Option { self.find_symbol_by_name(sym_name) } - pub fn findSymbolByVramOrVrom( + fn findSymbolByVramOrVrom( &self, address: u64, ) -> Option { self.find_symbol_by_vram_or_vrom(address) } - pub fn mixFolders(&self) -> Self { + fn mixFolders(&self) -> Self { self.mix_folders() } #[pyo3(signature=(print_vram=true, skip_without_symbols=true))] - pub fn toCsv(&self, print_vram: bool, skip_without_symbols: bool) -> String { + fn toCsv(&self, print_vram: bool, skip_without_symbols: bool) -> String { self.to_csv(print_vram, skip_without_symbols) } - pub fn toCsvSymbols(&self) -> String { + fn toCsvSymbols(&self) -> String { self.to_csv_symbols() } #[pyo3(signature=(print_vram=true, skip_without_symbols=true))] - pub fn printAsCsv(&self, print_vram: bool, skip_without_symbols: bool) { + fn printAsCsv(&self, print_vram: bool, skip_without_symbols: bool) { self.print_as_csv(print_vram, skip_without_symbols) } - pub fn printSymbolsCsv(&self) { + fn printSymbolsCsv(&self) { self.print_symbols_csv() } diff --git a/src/rs/symbol.rs b/src/rs/symbol.rs index 0763d2e..e94457b 100644 --- a/src/rs/symbol.rs +++ b/src/rs/symbol.rs @@ -139,7 +139,7 @@ pub(crate) mod python_bindings { impl super::Symbol { #[new] #[pyo3(signature=(name,vram,size=None,vrom=None,align=None))] - pub fn py_new( + fn py_new( name: String, vram: u64, size: Option, @@ -283,37 +283,37 @@ pub(crate) mod python_bindings { /* Methods */ - pub fn getVramStr(&self) -> String { + fn getVramStr(&self) -> String { self.get_vram_str() } - pub fn getSizeStr(&self) -> String { + fn getSizeStr(&self) -> String { self.get_size_str() } - pub fn getVromStr(&self) -> String { + fn getVromStr(&self) -> String { self.get_vrom_str() } - pub fn getAlignStr(&self) -> String { + fn getAlignStr(&self) -> String { self.get_align_str() } #[staticmethod] - pub fn toCsvHeader() -> String { + fn toCsvHeader() -> String { Self::to_csv_header() } - pub fn toCsv(&self) -> String { + fn toCsv(&self) -> String { self.to_csv() } #[staticmethod] - pub fn printCsvHeader() { + fn printCsvHeader() { Self::print_csv_header() } - pub fn printAsCsv(&self) { + fn printAsCsv(&self) { self.print_as_csv() } diff --git a/src/rs/symbol_comparison_info.rs b/src/rs/symbol_comparison_info.rs index a7ecb13..4e684d5 100644 --- a/src/rs/symbol_comparison_info.rs +++ b/src/rs/symbol_comparison_info.rs @@ -76,7 +76,7 @@ pub(crate) mod python_bindings { impl super::SymbolComparisonInfo { #[new] #[pyo3(signature = (symbol, build_address, build_file, expected_address, expected_file))] - pub fn py_new( + fn py_new( symbol: symbol::Symbol, build_address: u64, build_file: Option,