Skip to content

Commit 1e050bc

Browse files
committed
Auto merge of #3293 - rust-lang:rustup-2024-02-10, r=saethlin
Automatic Rustup
2 parents 5f25162 + 35ab7e1 commit 1e050bc

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
384b02c0825cefa59f2e8a99a33d9a5344959079
1+
b5c46dc5426038a49c95398bce30eeb20ec421e2

src/bin/miri.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
#![allow(
33
clippy::manual_range_contains,
44
clippy::useless_format,
5-
clippy::field_reassign_with_default
5+
clippy::field_reassign_with_default,
6+
rustc::diagnostic_outside_of_impl,
7+
rustc::untranslatable_diagnostic
68
)]
79

810
extern crate rustc_data_structures;

src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#![feature(nonzero_ops)]
1111
#![feature(let_chains)]
1212
#![feature(lint_reasons)]
13-
#![cfg_attr(not(bootstrap), feature(trait_upcasting))]
13+
#![feature(trait_upcasting)]
1414
// Configure clippy and other lints
1515
#![allow(
1616
clippy::collapsible_else_if,
@@ -33,8 +33,10 @@
3333
clippy::bool_to_int_with_if,
3434
clippy::box_default,
3535
clippy::needless_question_mark,
36+
rustc::diagnostic_outside_of_impl,
3637
// We are not implementing queries here so it's fine
37-
rustc::potential_query_instability
38+
rustc::potential_query_instability,
39+
rustc::untranslatable_diagnostic,
3840
)]
3941
#![warn(
4042
rust_2018_idioms,

0 commit comments

Comments
 (0)