migrate SubstringMatcher to new diff API
use new diff API everywhere & remove old diff API