Rollup merge of #81505 - henryboisdequin:cold_path-not-pub, r=sanxiyn

`fn cold_path` doesn't need to be pub Fixes #81429 Note: this PR also fixes a small typo that I found
rust-lang · Jan 30, 2021 · ba40cea · ba40cea
2 parents 6090c57 + fd5fb86
commit ba40cea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compiler/rustc_arena/src/lib.rs b/compiler/rustc_arena/src/lib.rs
@@ -32,7 +32,7 @@ use std::slice;
 
 #[inline(never)]
 #[cold]
-pub fn cold_path<F: FnOnce() -> R, R>(f: F) -> R {
+fn cold_path<F: FnOnce() -> R, R>(f: F) -> R {
     f()
 }
 

diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs
@@ -977,7 +977,7 @@ impl<'a> Resolver<'a> {
         });
         if let Some(def_span) = def_span {
             if span.overlaps(def_span) {
-                // Don't suggest typo suggestion for itself like in the followoing:
+                // Don't suggest typo suggestion for itself like in the following:
                 // error[E0423]: expected function, tuple struct or tuple variant, found struct `X`
                 //   --> $DIR/issue-64792-bad-unicode-ctor.rs:3:14
                 //    |
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ use std::slice; @@
     #[inline(never)]
     #[cold]
-    pub fn cold_path<F: FnOnce() -> R, R>(f: F) -> R {
+    fn cold_path<F: FnOnce() -> R, R>(f: F) -> R {
         f()
     }
@@ Expand Down @@