Unnamed repository; edit this file 'description' to name the repository.
Merge ref 'f8704be04fe1' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@f8704be04fe1150527fc2cf21dd44327f0fe87fb
Filtered ref: rust-lang/miri@5b8c7c29c70295897f1bf561ce3ca3478c2591a7
Upstream diff: https://github.com/rust-lang/rust/compare/d933cf483edf1605142ac6899ff32536c0ad8b22...f8704be04fe1150527fc2cf21dd44327f0fe87fb
This merge was created using https://github.com/rust-lang/josh-sync.
| -rw-r--r-- | crates/proc-macro-api/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/lib.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crates/proc-macro-api/src/lib.rs b/crates/proc-macro-api/src/lib.rs index 68b3afc3e8..e83ddb8594 100644 --- a/crates/proc-macro-api/src/lib.rs +++ b/crates/proc-macro-api/src/lib.rs @@ -10,7 +10,7 @@ feature = "sysroot-abi", feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span) )] -#![allow(internal_features)] +#![allow(internal_features, unused_features)] #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))] #[cfg(feature = "in-rust-tree")] diff --git a/crates/proc-macro-srv/src/lib.rs b/crates/proc-macro-srv/src/lib.rs index 65de804404..734cb4ecc1 100644 --- a/crates/proc-macro-srv/src/lib.rs +++ b/crates/proc-macro-srv/src/lib.rs @@ -18,7 +18,8 @@ internal_features, clippy::disallowed_types, clippy::print_stderr, - unused_crate_dependencies + unused_crate_dependencies, + unused_features )] #![deny(deprecated_safe, clippy::undocumented_unsafe_blocks)] |