Simplify message paths by est31 · Pull Request #108682 · rust-lang/rust

est31 · 2023-03-02T23:33:15Z

This makes it easier to open the messages file. Right now I have to first click on the locales dir to open it, and then on the en-US.ftl file. Cargo.toml and build.rs files are also in the top level, and I think there should not be more than one file, so a directory isn't really needed. The chosen strategy for pontoon adoption is out of tree. Even if this descision is changed in the future, the messages.ftl approach is also compatible with non-english translations living in-tree, as long as the non-english translations don't live in the compiler/rustc_foo/ directories but in different ones. That would also be helpful for grepability purposes.

The commit was the result of automated changes:

for p in compiler/rustc_*; do mv $p/locales/en-US.ftl $p/messages.ftl; rmdir $p/locales; done
for p in compiler/rustc_*; do sed -i "s#\.\./locales/en-US.ftl#../messages.ftl#" $p/src/lib.rs; done

r? @davidtwco

rustbot · 2023-03-02T23:33:24Z

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

rustc_error_messages was changed

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

bors · 2023-03-03T23:41:26Z

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

davidtwco

r=me after rebase

bors · 2023-03-08T01:37:32Z

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

davidtwco · 2023-03-08T10:53:43Z

@bors delegate=est31

Feel free to approve this after you rebase, it's likely to be a bit conflict prone.

bors · 2023-03-08T10:53:45Z

✌️ @est31 can now approve this pull request

est31 · 2023-03-08T20:37:52Z

It's strange that github/bors shows this as a merge conflict as local rebasing works well without requiring merge conflict resolution...

compiler-errors · 2023-03-08T20:38:45Z

Yeah, sometimes that happens. I think bors's merge conflict resolution is a bit pessimistic?

est31 · 2023-03-08T21:38:53Z

@bors r=davidtwco p=1 (conflict prone)

bors · 2023-03-08T21:38:56Z

📌 Commit 03cc5131e56062d177a32695334fd3a818b6381d has been approved by davidtwco

It is now in the queue for this repository.

bors · 2023-03-09T03:07:51Z

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

est31 · 2023-03-09T19:23:59Z

Hmm yeah getting this merged is a bit difficult, like #103042 was. outside of splitting it up or p=10 above rollups, the only chance is to wait until the stars line up so that no rollup PR is in the queue (usually those do change ftl files), and a PR is currently being tried that doesn't modify ftl files. Then one would rebase right at that moment, and and approve the pr.

I will spend the next week looking for opportunities to merge this. If there is still none, I will just set p=10.

compiler-errors · 2023-03-09T19:25:12Z

I would wait until the queue is calmed down, then land it with p=10.

This makes it easier to open the messages file while developing on features. The commit was the result of automatted changes: for p in compiler/rustc_*; do mv $p/locales/en-US.ftl $p/messages.ftl; rmdir $p/locales; done for p in compiler/rustc_*; do sed -i "s#\.\./locales/en-US.ftl#../messages.ftl#" $p/src/lib.rs; done

est31 · 2023-03-11T21:54:45Z

Okay, I'd say it's calmed down now, only 26 PRs waiting for admittance now.

@bors r=davidtwco

bors · 2023-03-11T21:54:47Z

📌 Commit 7e2ecb3 has been approved by davidtwco

It is now in the queue for this repository.

bors · 2023-03-12T00:49:28Z

💔 Test failed - checks-actions

est31 · 2023-03-12T01:59:48Z

@bors retry another instance of #108227

bors · 2023-03-12T03:51:24Z

⌛ Testing commit 7e2ecb3 with merge 501ad02...

bors · 2023-03-12T06:48:23Z

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

rust-timer · 2023-03-12T09:03:28Z

Finished benchmarking commit (501ad02): 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
Regressions ❌ (secondary)	0.7%	[0.5%, 0.9%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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)	2.5%	[2.5%, 2.5%]	1
Regressions ❌ (secondary)	1.9%	[1.2%, 3.4%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.5%	[2.5%, 2.5%]	1

Cycles

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

rust-log-analyzer · 2023-03-14T00:13:21Z

The job i686-mingw-2 failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

[2612/3021] Linking CXX static library lib\libLLVMMSP430CodeGen.a
[2613/3021] Linking CXX static library lib\libLLVMHexagonCodeGen.a
[2614/3021] Building CXX object tools/dsymutil/CMakeFiles/dsymutil.dir/MachODebugMapParser.cpp.obj
[2615/3021] Linking CXX static library lib\libLLVMAArch64CodeGen.a
FAILED: lib/libLLVMAArch64CodeGen.a cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMAArch64CodeGen.a && D:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMAArch64CodeGen.a lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64CallLowering.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64GlobalISelUtils.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64InstructionSelector.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64LegalizerInfo.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64O0PreLegalizerCombiner.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64PreLegalizerCombiner.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64PostLegalizerCombiner.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64PostLegalizerLowering.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64PostSelectOptimize.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/GISel/AArch64RegisterBankInfo.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64A57FPLoadBalancing.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64AdvSIMDScalarPass.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64AsmPrinter.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64BranchTargets.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64CallingConvention.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64CleanupLocalDynamicTLSPass.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64CollectLOH.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64CondBrTuning.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64ConditionalCompares.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64DeadRegisterDefinitionsPass.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64ExpandImm.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64ExpandPseudoInsts.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64FalkorHWPFFix.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64FastISel.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64A53Fix835769.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64FrameLowering.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64CompressJumpTables.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64ConditionOptimizer.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64RedundantCopyElimination.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64ISelDAGToDAG.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64ISelLowering.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64InstrInfo.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64LoadStoreOptimizer.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64LowerHomogeneousPrologEpilog.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64MachineFunctionInfo.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64MachineScheduler.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64MacroFusion.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64MIPeepholeOpt.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64MCInstLower.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64PromoteConstant.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64PBQPRegAlloc.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64RegisterInfo.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64SLSHardening.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64SelectionDAGInfo.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64SpeculationHardening.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64StackTagging.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64StackTaggingPreRA.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64StorePairSuppress.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64Subtarget.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64TargetMachine.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64TargetObjectFile.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64TargetTransformInfo.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/SVEIntrinsicOpts.cpp.obj lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64SIMDInstrOpt.cpp.obj && D:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMAArch64CodeGen.a && cd ."
D:\a\rust\rust\mingw32\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[2616/3021] Linking CXX static library lib\libLLVMRISCVCodeGen.a
[2617/3021] Linking CXX static library lib\libLLVMNVPTXCodeGen.a
[2618/3021] Linking CXX static library lib\libLLVMARMCodeGen.a
[2619/3021] Linking CXX static library lib\libLLVMMipsCodeGen.a
[2619/3021] Linking CXX static library lib\libLLVMMipsCodeGen.a
[2620/3021] Linking CXX static library lib\libLLVMPowerPCCodeGen.a
[2621/3021] Linking CXX executable bin\llvm-profdata.exe
[2622/3021] Linking CXX static library lib\libLLVMPasses.a
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit code: 1
build script failed, must exit now', C:\Users\runneradmin\.cargo\registry\src\index.crates.io-1cd66030c949c28d\cmake-0.1.48\src\lib.rs:975:5
finished in 299.571 seconds
Build completed unsuccessfully in 0:06:43
Build completed unsuccessfully in 0:06:43
make: *** [Makefile:80: ci-mingw-subset-2] Error 1

rustbot assigned davidtwco Mar 2, 2023

est31 mentioned this pull request Mar 3, 2023
Match unmatched backticks in compiler/ #108685
Merged

davidtwco approved these changes Mar 6, 2023
View reviewed changes

est31 force-pushed the simplify_dirs branch from c9825a7 to 5cf6af7Compare March 6, 2023 23:36

est31 force-pushed the simplify_dirs branch from 5cf6af7 to 03cc513Compare March 8, 2023 20:36

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 Mar 8, 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 Mar 9, 2023

est31 force-pushed the simplify_dirs branch from 03cc513 to 7e2ecb3Compare March 11, 2023 21:52

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 12, 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 Mar 12, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 12, 2023

bors merged commit 501ad02 into rust-lang:masterMar 12, 2023

rustbot added this to the 1.70.0 milestone Mar 12, 2023

ehuss mentioned this pull request Jun 27, 2023
Fix some links rust-lang/rustc-dev-guide#1705
Merged

Uh oh!

Uh oh!

Conversation

est31 commented Mar 2, 2023

Uh oh!

rustbot commented Mar 2, 2023

Uh oh!

bors commented Mar 3, 2023

Uh oh!

davidtwco left a comment

Choose a reason for hiding this comment

Uh oh!

bors commented Mar 8, 2023

Uh oh!

davidtwco commented Mar 8, 2023

Uh oh!

bors commented Mar 8, 2023

Uh oh!

est31 commented Mar 8, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compiler-errors commented Mar 8, 2023

Uh oh!

est31 commented Mar 8, 2023

Uh oh!

bors commented Mar 8, 2023

Uh oh!

bors commented Mar 9, 2023

Uh oh!

est31 commented Mar 9, 2023

Uh oh!

compiler-errors commented Mar 9, 2023

Uh oh!

est31 commented Mar 11, 2023

Uh oh!

bors commented Mar 11, 2023

Uh oh!

bors commented Mar 12, 2023

Uh oh!

est31 commented Mar 12, 2023

Uh oh!

bors commented Mar 12, 2023

Uh oh!

bors commented Mar 12, 2023

Uh oh!

rust-timer commented Mar 12, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

rust-log-analyzer commented Mar 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

est31 commented Mar 8, 2023•
edited
Loading