Skip to content

Commit 2400b36

Browse files
committed
Auto merge of #14577 - jsoref:spelling, r=lnicola
Spelling This PR corrects misspellings identified by the [check-spelling action](https://github.com/marketplace/actions/check-spelling). The misspellings have been reported at https://github.com/jsoref/rust-analyzer/actions/runs/4699991040#summary-12751355796 The action reports that the changes in this PR would make it happy: https://github.com/jsoref/rust-analyzer/actions/runs/4699991284#summary-12751356293 closes #14567
2 parents 112464f + bc7d84c commit 2400b36

File tree

83 files changed

+137
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+137
-136
lines changed

.github/actions/github-release/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ perform github releases but they all tend to have their set of drawbacks.
1010
Additionally nothing handles deleting releases which we need for our rolling
1111
`dev` release.
1212

13-
To handle all this this action rolls-its-own implementation using the
13+
To handle all this action rolls-its-own implementation using the
1414
actions/toolkit repository and packages published there. These run in a Docker
1515
container and take various inputs to orchestrate the release from the build.
1616

.github/workflows/autopublish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
shell: bash
3333
run: |
3434
git config --global user.email "runner@gha.local"
35-
git config --global user.name "Github Action"
35+
git config --global user.name "GitHub Action"
3636
rm Cargo.lock
3737
# Fix names for crates that were published before switch to kebab-case.
3838
cargo workspaces rename --from base-db base_db

.github/workflows/publish-libs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
shell: bash
3030
run: |
3131
git config --global user.email "runner@gha.local"
32-
git config --global user.name "Github Action"
32+
git config --global user.name "GitHub Action"
3333
# Remove r-a crates from the workspaces so we don't auto-publish them as well
3434
sed -i 's/ "crates\/\*"//' ./Cargo.toml
3535
cargo workspaces publish --yes --exact --from-git --no-git-commit --allow-dirty

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
},
7373
{
7474
// Used for testing the extension with a local build of the LSP server (in `target/release`)
75-
// with all other extendions loaded.
75+
// with all other extensions loaded.
7676
"name": "Run With Extensions",
7777
"type": "extensionHost",
7878
"request": "launch",

bench_data/glorious_old_parser

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3808,7 +3808,7 @@ impl<'a> Parser<'a> {
38083808
if self.eat_keyword(keywords::Else) || !cond.returns() {
38093809
let sp = self.sess.source_map().next_point(lo);
38103810
let mut err = self.diagnostic()
3811-
.struct_span_err(sp, "missing condition for `if` statemement");
3811+
.struct_span_err(sp, "missing condition for `if` statement");
38123812
err.span_label(sp, "expected if condition here");
38133813
return Err(err)
38143814
}

crates/hir-def/src/find_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const MAX_PATH_LEN: usize = 15;
4242
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
4343
pub enum PrefixKind {
4444
/// Causes paths to always start with either `self`, `super`, `crate` or a crate-name.
45-
/// This is the same as plain, just that paths will start with `self` iprepended f the path
45+
/// This is the same as plain, just that paths will start with `self` prepended if the path
4646
/// starts with an identifier that is not a crate.
4747
BySelf,
4848
/// Causes paths to ignore imports in the local module.

crates/hir-def/src/hir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ impl Binding {
502502
pub fn is_upvar(&self, relative_to: ExprId) -> bool {
503503
match self.owner {
504504
Some(x) => {
505-
// We assign expression ids in a way that outer closures will recieve
505+
// We assign expression ids in a way that outer closures will receive
506506
// a lower id
507507
x.into_raw() < relative_to.into_raw()
508508
}

crates/hir-def/src/macro_expansion_tests/mbe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ fn#19 main#20(#21)#21 {#22
9898
);
9999
}
100100
#[test]
101-
fn float_field_acces_macro_input() {
101+
fn float_field_access_macro_input() {
102102
check(
103103
r#"
104104
macro_rules! foo {

crates/hir-def/src/nameres/proc_macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl Attrs {
5252
}
5353

5454
// This fn is intended for `#[proc_macro_derive(..)]` and `#[rustc_builtin_macro(..)]`, which have
55-
// the same strucuture.
55+
// the same structure.
5656
#[rustfmt::skip]
5757
pub(crate) fn parse_macro_name_and_helper_attrs(tt: &[TokenTree]) -> Option<(Name, Box<[Name]>)> {
5858
match tt {

crates/hir-def/src/nameres/tests/mod_resolution.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ mod module;
887887
//- /module.rs
888888
#![cfg(NEVER)]
889889
890-
struct AlsoShoulntAppear;
890+
struct AlsoShouldNotAppear;
891891
"#,
892892
expect![[r#"
893893
crate

0 commit comments

Comments
 (0)