Skip to content

Commit

Permalink
Auto merge of rust-lang#12744 - hi-rustin:rustin-patch-typos, r=lnicola
Browse files Browse the repository at this point in the history
Fix typos

Signed-off-by: hi-rustin <rustin.liu@gmail.com>
  • Loading branch information
bors committed Jul 11, 2022
2 parents 5342f47 + d9ab7f2 commit f7bb932
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions crates/ide/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ pub struct Analysis {
// API, the API should in theory be usable as a library, or via a different
// protocol.
impl Analysis {
// Creates an analysis instance for a single file, without any extenal
// Creates an analysis instance for a single file, without any external
// dependencies, stdlib support or ability to apply changes. See
// `AnalysisHost` for creating a fully-featured analysis.
pub fn from_single_file(text: String) -> (Analysis, FileId) {
Expand Down Expand Up @@ -684,7 +684,7 @@ impl Analysis {
/// repeatable read). So what we do is we **cancel** all pending queries
/// before applying the change.
///
/// Salsa implements cancelation by unwinding with a special value and
/// Salsa implements cancellation by unwinding with a special value and
/// catching it on the API boundary.
fn with_db<F, T>(&self, f: F) -> Cancellable<T>
where
Expand Down

0 comments on commit f7bb932

Please sign in to comment.