refactor symbol searching logic into any_symbol_contains

Author: lolbinarycat

src/tools/run-make-support/src/symbols.rs

@@ -1,6 +1,6 @@
 use std::path::Path;
 use std::fs;
-use object::{self, Object, SymbolIterator};
+use object::{self, Object, SymbolIterator, ObjectSymbol};
 
 /// iterate through the symbols in an object file.
 ///
@@ -16,3 +16,19 @@ pub fn with_symbol_iter<P, F, R>(path: P, func: F) -> R where
     let mut iter = f.symbols();
     func(&mut iter)
 }
+
+pub fn any_symbol_contains(path: impl AsRef<Path>, substrings: &[&str]) -> bool {
+    with_symbol_iter(path, |syms| {
+        for sym in syms {
+            for substring in substrings {
+                if sym.name_bytes().unwrap().windows(substring.len())
+                    .any(|x| x == substring.as_bytes())
+                {
+                    eprintln!("{:?} contains {}", sym, substring);
+                    return true;
+                }
+            }
+        }
+        false
+    })
+}

tests/run-make/fmt-write-bloat/rmake.rs

@@ -1,7 +1,7 @@
 //@ ignore-windows
 //@ ignore-cross-compile
 
-use run_make_support::{rustc, symbols::with_symbol_iter, object::ObjectSymbol};
+use run_make_support::{rustc, symbols::any_symbol_contains};
 
 fn main() {
     rustc().input("main.rs").run();
@@ -12,12 +12,5 @@ fn main() {
         // otherwise, add them to the list of symbols to deny.
         panic_syms.extend_from_slice(&["panicking", "panic_fmt", "pad_integral", "Display"]);
     }
-    with_symbol_iter("main", |syms| for sym in syms {
-        dbg!(&sym);
-        for panic_sym in &panic_syms {
-            if sym.name().unwrap().contains(panic_sym) {
-                panic!("{:?} contains {}", sym, panic_sym);
-            }
-        }
-    });
+    assert!(!any_symbol_contains("main", &panic_syms));
 }