Skip to content

Commit 6e6662e

Browse files
committed
Auto merge of #126144 - fmease:rollup-i9pcdys, r=fmease
Rollup of 6 pull requests Successful merges: - #125951 (Stabilize `error_in_core`) - #125998 (std::unix::fs::get_mode implementation for illumos/solaris.) - #126057 (Make html rendered by rustdoc allow searching non-English identifier / alias) - #126065 (mark binding undetermined if target name exist and not obtained) - #126105 (Add debugging utils and comments to Fuchsia scripts) - #126138 (Fix typo in docs for std::pin) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1573ece + ecf6306 commit 6e6662e

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

tests/ui/std_instead_of_core.fixed

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ fn std_instead_of_core() {
4545

4646
let _ = std::env!("PATH");
4747

48-
// do not lint until `error_in_core` is stable
49-
use std::error::Error;
48+
use core::error::Error;
49+
//~^ ERROR: used import from `std` instead of `core`
5050

5151
// lint items re-exported from private modules, `core::iter::traits::iterator::Iterator`
5252
use core::iter::Iterator;

tests/ui/std_instead_of_core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ fn std_instead_of_core() {
4545

4646
let _ = std::env!("PATH");
4747

48-
// do not lint until `error_in_core` is stable
4948
use std::error::Error;
49+
//~^ ERROR: used import from `std` instead of `core`
5050

5151
// lint items re-exported from private modules, `core::iter::traits::iterator::Iterator`
5252
use std::iter::Iterator;

tests/ui/std_instead_of_core.stderr

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ error: used import from `std` instead of `core`
4949
LL | let cell_absolute = ::std::cell::Cell::new(8u32);
5050
| ^^^ help: consider importing the item from `core`: `core`
5151

52+
error: used import from `std` instead of `core`
53+
--> tests/ui/std_instead_of_core.rs:48:9
54+
|
55+
LL | use std::error::Error;
56+
| ^^^ help: consider importing the item from `core`: `core`
57+
5258
error: used import from `std` instead of `core`
5359
--> tests/ui/std_instead_of_core.rs:52:9
5460
|
@@ -79,5 +85,5 @@ LL | use alloc::slice::from_ref;
7985
= note: `-D clippy::alloc-instead-of-core` implied by `-D warnings`
8086
= help: to override `-D warnings` add `#[allow(clippy::alloc_instead_of_core)]`
8187

82-
error: aborting due to 12 previous errors
88+
error: aborting due to 13 previous errors
8389

0 commit comments

Comments
 (0)