Skip to content

Commit

Permalink
Auto merge of rust-lang#17241 - blyxyas:fix-typos, r=lnicola
Browse files Browse the repository at this point in the history
Chore: Fix some typos

rust-lang#124948

> In RA we gladly take typo fixes, but for now we definitely want them in the upstream repository.
  • Loading branch information
bors committed May 15, 2024
2 parents f019659 + 15983f4 commit 65dbe8e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ fn edit_struct_def(
strukt: &Either<ast::Struct, ast::Variant>,
record_fields: ast::RecordFieldList,
) {
// Note that we don't need to consider macro files in this function because this this is
// Note that we don't need to consider macro files in this function because this is
// currently not triggered for struct definitions inside macro calls.
let tuple_fields = record_fields
.fields()
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rust-analyzer/crates/ide-db/src/search.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Implementation of find-usages functionality.
//!
//! It is based on the standard ide trick: first, we run a fast text search to
//! get a super-set of matches. Then, we we confirm each match using precise
//! get a super-set of matches. Then, we confirm each match using precise
//! name resolution.

use std::mem;
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rust-analyzer/crates/profile/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ thread_local!(static IN_SCOPE: RefCell<bool> = const { RefCell::new(false) });
/// A wrapper around google_cpu_profiler.
///
/// Usage:
/// 1. Install gpref_tools (<https://github.com/gperftools/gperftools>), probably packaged with your Linux distro.
/// 1. Install gperf_tools (<https://github.com/gperftools/gperftools>), probably packaged with your Linux distro.
/// 2. Build with `cpu_profiler` feature.
/// 3. Run the code, the *raw* output would be in the `./out.profile` file.
/// 4. Install pprof for visualization (<https://github.com/google/pprof>).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl<T> TaskPool<T> {

/// `TaskQueue`, like its name suggests, queues tasks.
///
/// This should only be used used if a task must run after [`GlobalState::process_changes`]
/// This should only be used if a task must run after [`GlobalState::process_changes`]
/// has been called.
pub(crate) struct TaskQueue {
pub(crate) sender: crossbeam_channel::Sender<QueuedTask>,
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rust-analyzer/crates/salsa/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ pub trait QueryDb<'d>: Sized {
/// Trait implements by all of the "special types" associated with
/// each of your queries.
pub trait Query: Debug + Default + Sized + for<'d> QueryDb<'d> {
/// Type that you you give as a parameter -- for queries with zero
/// Type that you give as a parameter -- for queries with zero
/// or more than one input, this will be a tuple.
type Key: Clone + Debug + Hash + Eq;

Expand Down

0 comments on commit 65dbe8e

Please sign in to comment.