Rollup of 4 pull requests

[TaKO8Ki]

Successful merges:

• Remove opt_remap_env_constness from rustc_query_impl #100243 (Remove opt_remap_env_constness from rustc_query_impl)
• Add IpDisplayBuffer helper struct. #100625 (Add IpDisplayBuffer helper struct.)
• Use merged_ty method instead of rewriting it every time #100629 (Use merged_ty method instead of rewriting it every time)
• rustdoc JSON: Fix ICE with pub extern crate self as <self_crate_name> #100630 (rustdoc JSON: Fix ICE with pub extern crate self as <self_crate_name>)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

[TaKO8Ki]

@bors r+ rollup=never p=4

[bors]

📌 Commit af74e72 has been approved by TaKO8Ki

It is now in the queue for this repository.

[bors]

⌛ Testing commit af74e72 with merge 86c6ebe...

[bors]

☀️ Test successful - checks-actions
Approved by: TaKO8Ki
Pushing 86c6ebe to master...

[rust-timer]

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#100630	b6fd7d73d632261b187da51e93073dfc2fb21009
#100629	fef826266090dfec0c37e4cffb5163a2c48cbc2a
#100625	fe480d7a6216cb9ecd3522e71aa3b95d70abfa1d
#100243	593c22b8fa6503889d808c3e40f1e63d74d64a09

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

[rust-timer]

Finished benchmarking commit (86c6ebe): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

• Primary benchmarks: ✅ relevant improvement found
• Secondary benchmarks: mixed results

	mean1	max	count2
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.6%	3.7%	6
Improvements ✅ (primary)	-2.9%	-2.9%	1
Improvements ✅ (secondary)	-1.7%	-1.7%	2
All ❌✅ (primary)	-2.9%	-2.9%	1

Cycles

Results

• Primary benchmarks: ✅ relevant improvements found
• Secondary benchmarks: no relevant changes found

	mean1	max	count2
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.9%	-3.2%	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.9%	-3.2%	2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

1. the arithmetic mean of the percent change ↩ ↩²

2. number of relevant changes ↩ ↩²