Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup unused labels in messages.ftl #115728

Merged

Conversation

chenyukang
Copy link
Member

@chenyukang chenyukang commented Sep 10, 2023

These labels were not used, maybe because we removed the diagnostics but forgot them.

@rustbot
Copy link
Collaborator

rustbot commented Sep 10, 2023

r? @cjgillot

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 10, 2023
@fmease
Copy link
Member

fmease commented Sep 10, 2023

I've just opened #115744 which among other things makes E0401 (generic params from outer item) fully translatable (i.e., including the labels) contrary to this PR. Sorry, I didn't see this PR until a moment ago 😅

@bors
Copy link
Contributor

bors commented Sep 11, 2023

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

@chenyukang chenyukang force-pushed the yukang-fix-diag-generic-parameters branch from 044d327 to f9a9ff2 Compare September 11, 2023 23:27
@chenyukang chenyukang changed the title Fix diagnostic for generic parameters from outer function Cleanup unused labels in messages.ftl Sep 11, 2023
@chenyukang
Copy link
Member Author

I've just opened #115744 which among other things makes E0401 (generic params from outer item) fully translatable (i.e., including the labels) contrary to this PR. Sorry, I didn't see this PR until a moment ago 😅

never mind, I just rebased to master.

@cjgillot
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 12, 2023

📌 Commit f9a9ff2 has been approved by cjgillot

It is now in the queue for this repository.

@bors 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 Sep 12, 2023
@bjorn3
Copy link
Member

bjorn3 commented Sep 12, 2023

Can we have a tidy lint for this?

@bors
Copy link
Contributor

bors commented Sep 12, 2023

⌛ Testing commit f9a9ff2 with merge 53616b7...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 12, 2023
…arameters, r=cjgillot

Cleanup unused labels in messages.ftl

These labels were not used, maybe because we removed the diagnostics but forgot them.
@rust-log-analyzer
Copy link
Collaborator

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  Downloaded r-efi v4.2.0
   Compiling r-efi v4.2.0
   Compiling uefi_qemu_test v0.0.0 (/tmp/tmpg7buy8vh/uefi_qemu_test)
    Finished dev [unoptimized + debuginfo] target(s) in 1.28s
/tmp/tmpg7buy8vh/uefi_qemu_test/target/aarch64-unknown-uefi/debug/uefi_qemu_test.efi /tmp/tmpg7buy8vh/uefi_qemu_test/esp/efi/boot/bootaa64.efi
qemu-system-aarch64 -machine virt -cpu cortex-a72 -display none -serial stdio -drive if=pflash,format=raw,readonly=on,file=/usr/share/AAVMF/AAVMF_CODE.fd -drive if=pflash,format=raw,readonly=off,file=/tmp/tmpg7buy8vh/vars.fd -drive format=raw,file=fat:rw:/tmp/tmpg7buy8vh/uefi_qemu_test/esp
cargo build --manifest-path /tmp/tmp2h0t4qoz/uefi_qemu_test/Cargo.toml --target i686-unknown-uefi
    Updating crates.io index
warning: spurious network error (3 tries remaining): [7] Couldn't connect to server (Failed to connect to index.crates.io port 443 after 8243 ms: Couldn't connect to server)
warning: spurious network error (2 tries remaining): [7] Couldn't connect to server (Failed to connect to index.crates.io port 443 after 8186 ms: Couldn't connect to server)
warning: spurious network error (2 tries remaining): [7] Couldn't connect to server (Failed to connect to index.crates.io port 443 after 8186 ms: Couldn't connect to server)
warning: spurious network error (1 tries remaining): [7] Couldn't connect to server (Failed to connect to index.crates.io port 443 after 8179 ms: Couldn't connect to server)
error: failed to get `r-efi` as a dependency of package `uefi_qemu_test v0.0.0 (/tmp/tmp2h0t4qoz/uefi_qemu_test)`
Caused by:
  failed to query replaced source registry `crates-io`

Caused by:
---

Caused by:
  [7] Couldn't connect to server (Failed to connect to index.crates.io port 443 after 8187 ms: Couldn't connect to server)
Traceback (most recent call last):
  File "/uefi_qemu_test/run.py", line 137, in <module>
    main()
  File "/uefi_qemu_test/run.py", line 133, in main
    build_and_run(tmp_dir, target)
  File "/uefi_qemu_test/run.py", line 68, in build_and_run
    run('cargo',
  File "/uefi_qemu_test/run.py", line 19, in run
    return subprocess.run(cmd,
  File "/usr/lib/python3.10/subprocess.py", line 526, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['cargo', 'build', '--manifest-path', '/tmp/tmp2h0t4qoz/uefi_qemu_test/Cargo.toml', '--target', 'i686-unknown-uefi']' returned non-zero exit status 101.
  network time: Tue, 12 Sep 2023 11:22:32 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Contributor

bors commented Sep 12, 2023

💔 Test failed - checks-actions

@bors 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 Sep 12, 2023
@cjgillot
Copy link
Contributor

@bors retry

@bors 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 Sep 12, 2023
@bors
Copy link
Contributor

bors commented Sep 12, 2023

⌛ Testing commit f9a9ff2 with merge 5f6ee65...

@bors
Copy link
Contributor

bors commented Sep 12, 2023

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 5f6ee65 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 12, 2023
@bors bors merged commit 5f6ee65 into rust-lang:master Sep 12, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 12, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5f6ee65): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)
- - 0
Regressions ❌
(secondary)
0.9% [0.9%, 1.0%] 2
Improvements ✅
(primary)
-2.2% [-3.4%, -1.0%] 2
Improvements ✅
(secondary)
-3.2% [-3.2%, -3.2%] 1
All ❌✅ (primary) -2.2% [-3.4%, -1.0%] 2

Cycles

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

Binary size

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

Bootstrap: 632.792s -> 630.886s (-0.30%)
Artifact size: 317.95 MiB -> 317.92 MiB (-0.01%)

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 3, 2023
…-check, r=davidtwco

Add check_unused_messages in tidy

From rust-lang#115728 (comment)
The check is not 100% accurate, I guess it's enough for now.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 3, 2023
Rollup merge of rust-lang#115863 - chenyukang:yukang-add-message-tidy-check, r=davidtwco

Add check_unused_messages in tidy

From rust-lang#115728 (comment)
The check is not 100% accurate, I guess it's enough for now.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants