Rollup merge of #138160 - jdonszelmann:move-find-attr2, r=oli-obk

depend more on attr_data_structures and move find_attr! there

r?  ``@oli-obk``

This should be an easy one. It just moves some imports around. This is necessary for other changes that I'm working on not to have import cycles. However, it's an easy one to just merge on its own.

Author: matthiaskrgr