about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2019-04-07 10:29:51 +0200
committerGitHub <noreply@github.com>2019-04-07 10:29:51 +0200
commit0e455b046668778b16d3ed41cd2e701951337d72 (patch)
tree7a1c6d5316e7673dc530e57c9d5156eeb11dacd9
parentb996fd52ffb8dc4779744cbde57e07e10a677867 (diff)
parent920e47ceb5231a2f37632d8529d24d8ec7bf242c (diff)
downloadrust-0e455b046668778b16d3ed41cd2e701951337d72.tar.gz
rust-0e455b046668778b16d3ed41cd2e701951337d72.zip
Merge pull request #3918 from matthiaskrgr/typos
NFC: fix typos
-rw-r--r--clippy_lints/src/lib.rs2
-rw-r--r--clippy_lints/src/methods/mod.rs2
-rw-r--r--tests/ui-toml/functions_maxlines/test.rs2
-rw-r--r--tests/ui-toml/functions_maxlines/test.stderr2
4 files changed, 4 insertions, 4 deletions
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index bf98aa7e2b5..01d5f81dfbc 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -279,7 +279,7 @@ mod reexport {
 ///
 /// Pre-expansion lints run before any macro expansion has happened.
 ///
-/// Note that due to the architechture of the compiler, currently `cfg_attr` attributes on crate
+/// Note that due to the architecture of the compiler, currently `cfg_attr` attributes on crate
 /// level (i.e `#![cfg_attr(...)]`) will still be expanded even when using a pre-expansion pass.
 ///
 /// Used in `./src/driver.rs`.
diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs
index 858184d7ea1..7316a0a74f0 100644
--- a/clippy_lints/src/methods/mod.rs
+++ b/clippy_lints/src/methods/mod.rs
@@ -1635,7 +1635,7 @@ fn lint_get_unwrap<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, expr: &hir::Expr, get_a
 
     let mut span = expr.span;
 
-    // Handle the case where the result is immedately dereferenced
+    // Handle the case where the result is immediately dereferenced
     // by not requiring ref and pulling the dereference into the
     // suggestion.
     if_chain! {
diff --git a/tests/ui-toml/functions_maxlines/test.rs b/tests/ui-toml/functions_maxlines/test.rs
index cd0e0082586..a47677a1f3a 100644
--- a/tests/ui-toml/functions_maxlines/test.rs
+++ b/tests/ui-toml/functions_maxlines/test.rs
@@ -38,7 +38,7 @@ fn comment_after_code() {
 fn comment_before_code() {
     let _ = "test";
     /* This comment extends to the front of
-    teh code but this line should still count. */ let _ = 5;
+    the code but this line should still count. */ let _ = 5;
 }
 
 // This should be considered one line.
diff --git a/tests/ui-toml/functions_maxlines/test.stderr b/tests/ui-toml/functions_maxlines/test.stderr
index 0669e99370b..4b77ac551e7 100644
--- a/tests/ui-toml/functions_maxlines/test.stderr
+++ b/tests/ui-toml/functions_maxlines/test.stderr
@@ -15,7 +15,7 @@ error: This function has a large number of lines.
 LL | / fn comment_before_code() {
 LL | |     let _ = "test";
 LL | |     /* This comment extends to the front of
-LL | |     teh code but this line should still count. */ let _ = 5;
+LL | |     the code but this line should still count. */ let _ = 5;
 LL | | }
    | |_^