Investigate changes to archive.rs #1957
Description
When we added rlib support we copied some code from archive.rs.
Looks like a recently merged PR in rust upstream impacted this stuff a lot:
Need to see if this will help simplify our code a lot. Plus help whoever gets the rust toolchain update task this week, since it the above PR might impact that too.