On the black hole limit of rotating discs and rings