Skip to content

Commit ed65c75

Browse files
committed
Change ambiguous_panic_imports to report_in_deps false
1 parent 4222100 commit ed65c75

File tree

5 files changed

+4
-50
lines changed

5 files changed

+4
-50
lines changed

compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4522,7 +4522,7 @@ declare_lint! {
45224522
@future_incompatible = FutureIncompatibleInfo {
45234523
reason: FutureIncompatibilityReason::FutureReleaseError,
45244524
reference: "issue #147319 <https://github.com/rust-lang/rust/issues/147319>",
4525-
report_in_deps: true,
4525+
report_in_deps: false,
45264526
};
45274527
}
45284528

library/std/src/prelude/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub use core::prelude::v1::{
5656
#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
5757
#[doc(no_inline)]
5858
pub use crate::{
59-
dbg, eprint, eprintln, format, is_x86_feature_detected, print, println, thread_local, hash_map
59+
dbg, eprint, eprintln, format, is_x86_feature_detected, print, println, thread_local
6060
};
6161

6262
// These macros needs special handling, so that we don't export it *and* the modules of the same

tests/ui/imports/ambiguous-panic-re-emit.stderr

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,3 @@ note: `panic` could also refer to a macro from prelude
2727
error: aborting due to 1 previous error; 1 warning emitted
2828

2929
For more information about this error, try `rustc --explain E0425`.
30-
Future incompatibility report: Future breakage diagnostic:
31-
warning: `panic` is ambiguous
32-
--> $DIR/ambiguous-panic-re-emit.rs:16:5
33-
|
34-
LL | panic!();
35-
| ^^^^^ ambiguous name
36-
|
37-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
38-
= note: for more information, see issue #147319 <https://github.com/rust-lang/rust/issues/147319>
39-
= note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
40-
note: `panic` could refer to the macro imported here
41-
--> $DIR/ambiguous-panic-re-emit.rs:11:9
42-
|
43-
LL | use std::prelude::v1::*;
44-
| ^^^^^^^^^^^^^^^^^^^
45-
= help: consider adding an explicit import of `panic` to disambiguate
46-
= help: or use `crate::panic` to refer to this macro unambiguously
47-
note: `panic` could also refer to a macro from prelude
48-
--> $SRC_DIR/core/src/prelude/mod.rs:LL:COL
49-
= note: `#[warn(ambiguous_panic_imports)]` (part of `#[warn(future_incompatible)]`) on by default
50-

tests/ui/imports/ambiguous-panic.stderr

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,3 @@ LL | #![deny(ambiguous_panic_imports)]
2424

2525
error: aborting due to 1 previous error
2626

27-
Future incompatibility report: Future breakage diagnostic:
28-
error: `panic` is ambiguous
29-
--> $DIR/ambiguous-panic.rs:10:5
30-
|
31-
LL | panic!();
32-
| ^^^^^ ambiguous name
33-
|
34-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
35-
= note: for more information, see issue #147319 <https://github.com/rust-lang/rust/issues/147319>
36-
= note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
37-
note: `panic` could refer to the macro imported here
38-
--> $DIR/ambiguous-panic.rs:6:5
39-
|
40-
LL | use std::prelude::v1::*;
41-
| ^^^^^^^^^^^^^^^^^^^
42-
= help: consider adding an explicit import of `panic` to disambiguate
43-
= help: or use `crate::panic` to refer to this macro unambiguously
44-
note: `panic` could also refer to a macro from prelude
45-
--> $SRC_DIR/core/src/prelude/mod.rs:LL:COL
46-
note: the lint level is defined here
47-
--> $DIR/ambiguous-panic.rs:1:9
48-
|
49-
LL | #![deny(ambiguous_panic_imports)]
50-
| ^^^^^^^^^^^^^^^^^^^^^^^
51-

tests/ui/stats/input-stats.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ast-stats GenericArgs 40 (NN.N%) 1 40
5757
ast-stats - AngleBracketed 40 (NN.N%) 1
5858
ast-stats Crate 40 (NN.N%) 1 40
5959
ast-stats ----------------------------------------------------------------
60-
ast-stats Total 7_440 129
60+
ast-stats Total 7_384 127
6161
ast-stats ================================================================
6262
hir-stats ================================================================
6363
hir-stats HIR STATS: input_stats
@@ -119,5 +119,5 @@ hir-stats TraitItemId 8 (NN.N%) 2 4
119119
hir-stats ImplItemId 8 (NN.N%) 2 4
120120
hir-stats ForeignItemId 4 (NN.N%) 1 4
121121
hir-stats ----------------------------------------------------------------
122-
hir-stats Total 8_616 173
122+
hir-stats Total 8_576 172
123123
hir-stats ================================================================

0 commit comments

Comments
 (0)