Use const_error! when possible
#136844
Merged
const_error! when possible
#136844
const_error! when possible
#136844