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/rust-analyzer@5ecd3ed8b0f7a3cf0bf8ede9d44d29e94c887fa8
Upstream diff: https://github.com/rust-lang/rust/compare/e7d90c695a39426baf5ae705de2f9570a72229de...f8704be04fe1150527fc2cf21dd44327f0fe87fb
This merge was created using https://github.com/rust-lang/josh-sync.
| -rw-r--r-- | crates/base-db/src/input.rs | 2 | ||||
| -rw-r--r-- | crates/hir-def/src/visibility.rs | 4 | ||||
| -rw-r--r-- | crates/proc-macro-api/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/lib.rs | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/crates/base-db/src/input.rs b/crates/base-db/src/input.rs index 94793a3618..151aba82a2 100644 --- a/crates/base-db/src/input.rs +++ b/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(); diff --git a/crates/hir-def/src/visibility.rs b/crates/hir-def/src/visibility.rs index 6fe9c186cc..cb5eed1b8b 100644 --- a/crates/hir-def/src/visibility.rs +++ b/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, 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)] |