Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6346613

Browse files
committedMar 1, 2024
Auto merge of #121845 - matthiaskrgr:rollup-7q4bzuc, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #119199 (Add arm64ec-pc-windows-msvc target) - #121416 (Improve error messages for generics with default parameters) - #121475 (Add tidy check for .stderr/.stdout files for non-existent test revisions) - #121736 (Remove `Mutex::unlock` Function) - #121744 (Stop using Bubble in coherence and instead emulate it with an intercrte check) - #121784 (Make the success arms of `if lhs || rhs` meet up in a separate block) - #121818 (CFI: Remove unused `typeid_for_fnsig`) - #121819 (Handle stashing of delayed bugs) - #121828 (Remove unused fluent messages) - #121831 (Fix typo in comment) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b0696a5 + 516e844 commit 6346613

File tree

70 files changed

+566
-864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+566
-864
lines changed
 

‎Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,9 @@ version = "0.1.0"
447447

448448
[[package]]
449449
name = "cc"
450-
version = "1.0.79"
450+
version = "1.0.88"
451451
source = "registry+https://github.com/rust-lang/crates.io-index"
452-
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
452+
checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc"
453453

454454
[[package]]
455455
name = "cfg-if"

‎compiler/rustc_builtin_macros/messages.ftl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,6 @@ builtin_macros_requires_cfg_pattern =
221221
macro requires a cfg-pattern as an argument
222222
.label = cfg-pattern required
223223
224-
builtin_macros_should_panic = functions using `#[should_panic]` must return `()`
225-
226-
builtin_macros_test_arg_non_lifetime = functions used as tests can not have any non-lifetime generic parameters
227-
228-
builtin_macros_test_args = functions used as tests can not have any arguments
229-
230224
builtin_macros_test_bad_fn = {$kind} functions cannot be used for tests
231225
.label = `{$kind}` because of this
232226

0 commit comments

Comments
 (0)
Please sign in to comment.