Skip to content

Commit ba40cea

Browse files
authored
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
2 parents 6090c57 + fd5fb86 commit ba40cea

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

compiler/rustc_arena/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use std::slice;
3232

3333
#[inline(never)]
3434
#[cold]
35-
pub fn cold_path<F: FnOnce() -> R, R>(f: F) -> R {
35+
fn cold_path<F: FnOnce() -> R, R>(f: F) -> R {
3636
f()
3737
}
3838

compiler/rustc_resolve/src/diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ impl<'a> Resolver<'a> {
977977
});
978978
if let Some(def_span) = def_span {
979979
if span.overlaps(def_span) {
980-
// Don't suggest typo suggestion for itself like in the followoing:
980+
// Don't suggest typo suggestion for itself like in the following:
981981
// error[E0423]: expected function, tuple struct or tuple variant, found struct `X`
982982
// --> $DIR/issue-64792-bad-unicode-ctor.rs:3:14
983983
// |

0 commit comments

Comments
 (0)