Merge ref 'f8704be04fe1' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: rust-lang/rust@f8704be04f
Filtered ref: rust-lang/rust-analyzer@5ecd3ed8b0
Upstream diff: e7d90c695a...f8704be04f

This merge was created using https://github.com/rust-lang/josh-sync.

crates/base-db/src/input.rs

@@ -742,7 +742,7 @@ impl CrateGraphBuilder {
         deps.into_iter()
     }
 
-    /// Returns all crates in the graph, sorted in topological order (ie. dependencies of a crate
+    /// Returns all crates in the graph, sorted in topological order (i.e. dependencies of a crate
     /// come before the crate itself).
     fn crates_in_topological_order(&self) -> Vec<CrateBuilderId> {
         let mut res = Vec::new();

crates/hir-def/src/visibility.rs

@@ -146,7 +146,7 @@ impl Visibility {
 
     /// Returns the most permissive visibility of `self` and `other`.
     ///
-    /// If there is no subset relation between `self` and `other`, returns `None` (ie. they're only
+    /// If there is no subset relation between `self` and `other`, returns `None` (i.e. they're only
     /// visible in unrelated modules).
     pub(crate) fn max(
         self,
@@ -212,7 +212,7 @@ impl Visibility {
 
     /// Returns the least permissive visibility of `self` and `other`.
     ///
-    /// If there is no subset relation between `self` and `other`, returns `None` (ie. they're only
+    /// If there is no subset relation between `self` and `other`, returns `None` (i.e. they're only
     /// visible in unrelated modules).
     pub(crate) fn min(
         self,

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")]

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)]