resolve: Properly integrate derives and `macro_rules` scopes#63667

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

petrochenkov:deriveholderspetrochenkov/rust:deriveholdersCopy head branch name to clipboard