Add `rustc_fluent_macro` to decouple fluent from `rustc_macros` #110407

Noratrieb · 2023-04-16T12:36:41Z

Fluent, with all the icu4x it brings in, takes quite some time to compile. fluent_messages! is only needed in further downstream rustc crates, but is blocking more upstream crates like rustc_index. By splitting it out, we allow rustc_macros to be compiled earlier, which speeds up x check compiler by about 5 seconds (and even more after the needless dependency on serde_json is removed from rustc_data_structures).

rustbot · 2023-04-16T12:36:46Z

r? @b-naber

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

rustbot · 2023-04-16T12:36:50Z

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @TaKO8Ki

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @TaKO8Ki

rustbot · 2023-04-16T13:22:25Z

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

…bject-notationing, r=fee1-dead Don't use `serde_json` to serialize a simple JSON object This avoids `rustc_data_structures` depending on `serde_json` which allows it to be compiled much earlier, unlocking most of rustc. This used to not matter, but after rust-lang#110407 we're not blocked on fluent anymore, which means that it's now a blocking edge. ![image](https://user-images.githubusercontent.com/48135649/232313178-e0150420-3020-4eb6-98d3-fe5294a8f947.png) This saves a few more seconds. cc `@Zoxc` who added it recently

davidtwco · 2023-04-17T10:58:46Z

r? @davidtwco
@bors r+

bors · 2023-04-17T10:58:48Z

📌 Commit ff04b6a has been approved by davidtwco

It is now in the queue for this repository.

Add `rustc_fluent_macro` to decouple fluent from `rustc_macros` Fluent, with all the icu4x it brings in, takes quite some time to compile. `fluent_messages!` is only needed in further downstream rustc crates, but is blocking more upstream crates like `rustc_index`. By splitting it out, we allow `rustc_macros` to be compiled earlier, which speeds up `x check compiler` by about 5 seconds (and even more after the needless dependency on `serde_json` is removed from `rustc_data_structures`).

…bject-notationing, r=fee1-dead Don't use `serde_json` to serialize a simple JSON object This avoids `rustc_data_structures` depending on `serde_json` which allows it to be compiled much earlier, unlocking most of rustc. This used to not matter, but after rust-lang#110407 we're not blocked on fluent anymore, which means that it's now a blocking edge. ![image](https://user-images.githubusercontent.com/48135649/232313178-e0150420-3020-4eb6-98d3-fe5294a8f947.png) This saves a few more seconds. cc ``@Zoxc`` who added it recently

Add `rustc_fluent_macro` to decouple fluent from `rustc_macros` Fluent, with all the icu4x it brings in, takes quite some time to compile. `fluent_messages!` is only needed in further downstream rustc crates, but is blocking more upstream crates like `rustc_index`. By splitting it out, we allow `rustc_macros` to be compiled earlier, which speeds up `x check compiler` by about 5 seconds (and even more after the needless dependency on `serde_json` is removed from `rustc_data_structures`).

…bject-notationing, r=fee1-dead Don't use `serde_json` to serialize a simple JSON object This avoids `rustc_data_structures` depending on `serde_json` which allows it to be compiled much earlier, unlocking most of rustc. This used to not matter, but after rust-lang#110407 we're not blocked on fluent anymore, which means that it's now a blocking edge. ![image](https://user-images.githubusercontent.com/48135649/232313178-e0150420-3020-4eb6-98d3-fe5294a8f947.png) This saves a few more seconds. cc ```@Zoxc``` who added it recently

compiler-errors · 2023-04-18T03:17:50Z

@bors r- failed in a rollup: #110468 (comment)

Seems like the new crate triggers rustc::default_hash_types.

…bject-notationing, r=fee1-dead Don't use `serde_json` to serialize a simple JSON object This avoids `rustc_data_structures` depending on `serde_json` which allows it to be compiled much earlier, unlocking most of rustc. This used to not matter, but after rust-lang#110407 we're not blocked on fluent anymore, which means that it's now a blocking edge. ![image](https://user-images.githubusercontent.com/48135649/232313178-e0150420-3020-4eb6-98d3-fe5294a8f947.png) This saves a few more seconds. cc ````@Zoxc```` who added it recently

Noratrieb · 2023-04-18T07:43:38Z

@bors r=davidtwco

bors · 2023-04-18T07:43:40Z

📌 Commit 3ff4529f71131ee5cd1f7232d2e782caad0e3295 has been approved by davidtwco

It is now in the queue for this repository.

bors · 2023-04-18T15:03:09Z

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

Fluent, with all the icu4x it brings in, takes quite some time to compile. `fluent_messages!` is only needed in further downstream rustc crates, but is blocking more upstream crates like `rustc_index`. By splitting it out, we allow `rustc_macros` to be compiled earlier, which speeds up `x check compiler` by about 5 seconds (and even more after the needless dependency on `serde_json` is removed from `rustc_data_structures`).

Noratrieb · 2023-04-18T19:38:22Z

@bors r=davidtwco

bors · 2023-04-18T19:38:24Z

📌 Commit b5d3d97 has been approved by davidtwco

It is now in the queue for this repository.

bors · 2023-04-19T08:26:50Z

⌛ Testing commit b5d3d97 with merge d7f9e81...

bors · 2023-04-19T10:39:27Z

☀️ Test successful - checks-actions
Approved by: davidtwco
Pushing d7f9e81 to master...

rust-timer · 2023-04-19T12:03:34Z

Finished benchmarking commit (d7f9e81): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.5%	[0.5%, 0.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[0.5%, 0.5%]	1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.7%	[3.7%, 3.7%]	1
Regressions ❌ (secondary)	3.4%	[3.4%, 3.4%]	1
Improvements ✅ (primary)	-3.3%	[-3.3%, -3.3%]	1
Improvements ✅ (secondary)	-2.5%	[-2.5%, -2.5%]	1
All ❌✅ (primary)	0.2%	[-3.3%, 3.7%]	2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.0%]	2
All ❌✅ (primary)	-	-	0

rustbot assigned b-naber Apr 16, 2023

This comment has been minimized.

# to view

Noratrieb mentioned this pull request Apr 16, 2023

Don't use serde_json to serialize a simple JSON object #110409

Merged

Noratrieb force-pushed the fluent-macro branch from 97bc4fc to 25a0968 Compare April 16, 2023 13:22

This comment has been minimized.

# to view

rust-cloud-vms bot force-pushed the fluent-macro branch from 25a0968 to 13d3546 Compare April 16, 2023 14:55

This comment has been minimized.

# to view

rust-cloud-vms bot force-pushed the fluent-macro branch from 13d3546 to ff04b6a Compare April 16, 2023 16:19

davidtwco approved these changes Apr 17, 2023

View reviewed changes

rustbot assigned davidtwco and unassigned b-naber Apr 17, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2023

matthiaskrgr mentioned this pull request Apr 17, 2023

Rollup of 6 pull requests #110463

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 18, 2023

rust-cloud-vms bot force-pushed the fluent-macro branch from ff04b6a to 3ff4529 Compare April 18, 2023 06:40

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 18, 2023

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 18, 2023

Noratrieb force-pushed the fluent-macro branch from 3ff4529 to 7880044 Compare April 18, 2023 18:04

This comment has been minimized.

# to view

rust-cloud-vms bot force-pushed the fluent-macro branch from 7880044 to b5d3d97 Compare April 18, 2023 18:56

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 18, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2023

bors merged commit d7f9e81 into rust-lang:master Apr 19, 2023

rustbot added this to the 1.71.0 milestone Apr 19, 2023

Noratrieb deleted the fluent-macro branch April 19, 2023 10:44

matthiaskrgr mentioned this pull request Nov 20, 2023

ICE: broken MIR in DefId: index of non-array #118111

Closed

matthiaskrgr mentioned this pull request Feb 27, 2024

ICE: assertion failed: Binder == Binder #121688

Closed

Add rustc_fluent_macro to decouple fluent from rustc_macros #110407

Add rustc_fluent_macro to decouple fluent from rustc_macros #110407

Uh oh!

Conversation

Noratrieb commented Apr 16, 2023

Uh oh!

rustbot commented Apr 16, 2023

Uh oh!

rustbot commented Apr 16, 2023

Uh oh!

This comment has been minimized.

rustbot commented Apr 16, 2023

Uh oh!

This comment has been minimized.

This comment has been minimized.

davidtwco commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

compiler-errors commented Apr 18, 2023

Uh oh!

Noratrieb commented Apr 18, 2023

Uh oh!

bors commented Apr 18, 2023

Uh oh!

bors commented Apr 18, 2023

Uh oh!

This comment has been minimized.

Noratrieb commented Apr 18, 2023

Uh oh!

bors commented Apr 18, 2023

Uh oh!

bors commented Apr 19, 2023

Uh oh!

bors commented Apr 19, 2023

Uh oh!

rust-timer commented Apr 19, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Uh oh!

Add `rustc_fluent_macro` to decouple fluent from `rustc_macros` #110407

Add `rustc_fluent_macro` to decouple fluent from `rustc_macros` #110407