Rollup merge of #41146 - est31:master, r=nrc
Rollup merge of #41146 - est31:master, r=nrc

pub(restricted) didn't make it into 1.17

Gets shipped in 1.18 instead.

graydon/rust,GBGamer/rust,graydon/rust,GBGamer/rust,aidancully/rust,GBGamer/rust,GBGamer/rust,GBGamer/rust,graydon/rust,graydon/rust,aidancully/rust,GBGamer/rust,GBGamer/rust,graydon/rust,aidancully/rust,aidancully/rust,aidancully/rust,GBGamer/rust,aidancully/rust,graydon/rust