Rename categorization and stop re-exporting its variants.

[Ms2ger]

No description provided.

[rust-highfive]

r? @arielb1

(rust_highfive has picked a reviewer for you, use r? to override)

[arielb1]

We may want to do some re-categorization as part of the MIR work.

r? @pnkfelix

[bors]

☔ The latest upstream changes (presumably #29327) made this pull request unmergeable. Please resolve the merge conflicts.

[pnkfelix]

@Ms2ger unfortunately I let this sit in my review queue so long that it has become invalidated.

As a refactoring it seems fine, but @arielb1 is right to wonder if the mem-categorization code may well change with the coming MIR changes...

anyway, it is lgtm as it is. if @Ms2ger rebases, I can re-review. Seems relatively harmless either way, up to you.

[Ms2ger]

@pnkfelix r?

[nikomatsakis]

My expectation is that mem-categorization will largely go away, but I think it's fine to refactor it.

[nikomatsakis]

@bors r+

[bors]

📌 Commit 9e135f7 has been approved by nikomatsakis

[bors]

⌛ Testing commit 9e135f7 with merge 5b11b28...

[bors]

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt