Skip to content

Commit 326a2e5

Browse files
authored
Merge pull request rust-lang#18678 from regexident/fix-typos
minor: Fix a few typos
2 parents 6c1138e + c8abe14 commit 326a2e5

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/tools/rust-analyzer/crates/hir-ty/src/interner.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl chalk_ir::interner::Interner for Interner {
5555
type InternedConst = Interned<InternedWrapper<ConstData>>;
5656
type InternedConcreteConst = ConstScalar;
5757
type InternedGenericArg = GenericArgData;
58-
// We could do the following, but that saves "only" 20mb on self while increasing inferecene
58+
// We could do the following, but that saves "only" 20mb on self while increasing inference
5959
// time by ~2.5%
6060
// type InternedGoal = Interned<InternedWrapper<GoalData>>;
6161
type InternedGoal = Arc<GoalData>;

src/tools/rust-analyzer/crates/ide/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ impl Analysis {
299299

300300
/// Gets the syntax tree of the file.
301301
pub fn parse(&self, file_id: FileId) -> Cancellable<SourceFile> {
302-
// FIXME editiojn
302+
// FIXME edition
303303
self.with_db(|db| db.parse(EditionedFileId::current_edition(file_id)).tree())
304304
}
305305

@@ -540,7 +540,7 @@ impl Analysis {
540540
/// Returns URL(s) for the documentation of the symbol under the cursor.
541541
/// # Arguments
542542
/// * `position` - Position in the file.
543-
/// * `target_dir` - Directory where the build output is storeda.
543+
/// * `target_dir` - Directory where the build output is stored.
544544
pub fn external_docs(
545545
&self,
546546
position: FilePosition,

src/tools/rust-analyzer/crates/ra-salsa/src/durability.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// case), and we know that the query only used inputs of medium
1212
/// durability or higher, then we can skip that enumeration.
1313
///
14-
/// Typically, one assigns low durabilites to inputs that the user is
14+
/// Typically, one assigns low durabilities to inputs that the user is
1515
/// frequently editing. Medium or high durabilities are used for
1616
/// configuration, the source from library crates, or other things
1717
/// that are unlikely to be edited.

src/tools/rust-analyzer/crates/ra-salsa/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ pub trait ParallelDatabase: Database + Send {
291291
/// # Panics
292292
///
293293
/// It is not permitted to create a snapshot from inside of a
294-
/// query. Attepting to do so will panic.
294+
/// query. Attempting to do so will panic.
295295
///
296296
/// # Deadlock warning
297297
///

src/tools/rust-analyzer/crates/ra-salsa/tests/cycles.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ fn cycle_revalidate_unchanged_twice() {
255255
db.set_b_invokes(CycleQuery::A);
256256

257257
assert!(db.cycle_a().is_err());
258-
db.set_c_invokes(CycleQuery::A); // force new revisi5on
258+
db.set_c_invokes(CycleQuery::A); // force new revision
259259

260260
// on this run
261261
expect![[r#"

0 commit comments

Comments
 (0)