Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #153344 - JonathanBrouwer:rollup-uL4XlqI, r=JonathanBrouwer
Rollup of 6 pull requests
Successful merges:
- rust-lang/rust#153336 (stdarch subtree update)
- rust-lang/rust#152943 (Parse `impl` restrictions)
- rust-lang/rust#153184 (Replace CodegenResults with CompiledModules)
- rust-lang/rust#153285 (Update call-llvm-intrinsics test for Rust 1.94.0 IR)
- rust-lang/rust#153319 (Comments and docs: add missing periods to "ie.")
- rust-lang/rust#153326 (Make `rustc_with_all_queries!` pass query modifiers as named values)
| -rw-r--r-- | crates/base-db/src/input.rs | 2 | ||||
| -rw-r--r-- | crates/hir-def/src/visibility.rs | 4 |
2 files changed, 3 insertions, 3 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 a1645de6ec..ccd001df69 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, |