Skip to content

Commit 9b18a12

Browse files
committed
Auto merge of rust-lang#132190 - matthiaskrgr:rollup-rsocfiz, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - rust-lang#131875 (Add WASM | WASI | Emscripten groups to triagebot.toml) - rust-lang#132019 (Document `PartialEq` impl for `OnceLock`) - rust-lang#132182 (Downgrade `untranslatable_diagnostic` and `diagnostic_outside_of_impl` to `allow`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4d88de2 + 5dd6010 commit 9b18a12

File tree

3 files changed

+59
-2
lines changed

3 files changed

+59
-2
lines changed

compiler/rustc_lint/src/internal.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ declare_tool_lint! {
427427
/// More details on translatable diagnostics can be found
428428
/// [here](https://rustc-dev-guide.rust-lang.org/diagnostics/translation.html).
429429
pub rustc::UNTRANSLATABLE_DIAGNOSTIC,
430-
Deny,
430+
Allow,
431431
"prevent creation of diagnostics which cannot be translated",
432432
report_in_external_macro: true,
433433
@eval_always = true
@@ -441,7 +441,7 @@ declare_tool_lint! {
441441
/// More details on diagnostics implementations can be found
442442
/// [here](https://rustc-dev-guide.rust-lang.org/diagnostics/diagnostic-structs.html).
443443
pub rustc::DIAGNOSTIC_OUTSIDE_OF_IMPL,
444-
Deny,
444+
Allow,
445445
"prevent diagnostic creation outside of `Diagnostic`/`Subdiagnostic`/`LintDiagnostic` impls",
446446
report_in_external_macro: true,
447447
@eval_always = true

library/std/src/sync/once_lock.rs

+20
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,26 @@ impl<T> From<T> for OnceLock<T> {
634634

635635
#[stable(feature = "once_cell", since = "1.70.0")]
636636
impl<T: PartialEq> PartialEq for OnceLock<T> {
637+
/// Equality for two `OnceLock`s.
638+
///
639+
/// Two `OnceLock`s are equal if they either both contain values and their
640+
/// values are equal, or if neither contains a value.
641+
///
642+
/// # Examples
643+
///
644+
/// ```
645+
/// use std::sync::OnceLock;
646+
///
647+
/// let five = OnceLock::new();
648+
/// five.set(5).unwrap();
649+
///
650+
/// let also_five = OnceLock::new();
651+
/// also_five.set(5).unwrap();
652+
///
653+
/// assert!(five == also_five);
654+
///
655+
/// assert!(OnceLock::<u32>::new() == OnceLock::<u32>::new());
656+
/// ```
637657
#[inline]
638658
fn eq(&self, other: &OnceLock<T>) -> bool {
639659
self.get() == other.get()

triagebot.toml

+37
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,43 @@ In case it's useful, here are some [instructions] for tackling these sorts of is
135135
"""
136136
label = "O-rfl"
137137

138+
[ping.wasm]
139+
alias = ["webassembly"]
140+
message = """\
141+
Hey WASM notification group! This issue or PR could use some WebAssembly-specific
142+
guidance. Could one of you weigh in? Thanks <3
143+
144+
(In case it's useful, here are some [instructions] for tackling these sorts of
145+
issues).
146+
147+
[instructions]: https://rustc-dev-guide.rust-lang.org/notification-groups/wasm.html
148+
"""
149+
label = "O-wasm"
150+
151+
[ping.wasi]
152+
message = """\
153+
Hey WASI notification group! This issue or PR could use some WASI-specific guidance.
154+
Could one of you weigh in? Thanks <3
155+
156+
(In case it's useful, here are some [instructions] for tackling these sorts of
157+
issues).
158+
159+
[instructions]: https://rustc-dev-guide.rust-lang.org/notification-groups/wasi.html
160+
"""
161+
label = "O-wasi"
162+
163+
[ping.emscripten]
164+
message = """\
165+
Hey Emscripten notification group! This issue or PR could use some Emscripten-specific
166+
guidance. Could one of you weigh in? Thanks <3
167+
168+
(In case it's useful, here are some [instructions] for tackling these sorts of
169+
issues).
170+
171+
[instructions]: https://rustc-dev-guide.rust-lang.org/notification-groups/emscripten.html
172+
"""
173+
label = "O-emscripten"
174+
138175
[prioritize]
139176
label = "I-prioritize"
140177

0 commit comments

Comments
 (0)