Skip to content

Point to the unstable segment of an import path instead of to the whole path #158075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Jun 19, 2026
Merged

Point to the unstable segment of an import path instead of to the whole path #158075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_expand/src/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,7 @@ impl<'a> ExtCtxt<'a> {
pub fn std_path(&self, components: &[Symbol]) -> Vec<Ident> {
let def_site = self.with_def_site_ctxt(DUMMY_SP);
iter::once(Ident::new(kw::DollarCrate, def_site))
.chain(components.iter().map(|&s| Ident::with_dummy_span(s)))
.chain(components.iter().map(|&s| Ident::new(s, def_site)))
.collect()
}
pub fn def_site_path(&self, components: &[Symbol]) -> Vec<Ident> {
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_passes/src/stability.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ impl<'tcx> Visitor<'tcx> for Checker<'tcx> {
self.tcx.check_stability_allow_unstable(
def_id,
None,
path.span,
path_segment.ident.span,
None,
if is_unstable_reexport(self.tcx, id) {
AllowUnstable::Yes
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/feature-gates/feature-gate-io_error_kind_in_core.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error[E0658]: use of unstable library feature `core_io`
--> $DIR/feature-gate-io_error_kind_in_core.rs:6:5
--> $DIR/feature-gate-io_error_kind_in_core.rs:6:11
|
LL | use core::io::ErrorKind as ErrorKindFromCore;
| ^^^^^^^^^^^^^^^^^^^
| ^^
|
= note: see issue #154046 <https://github.com/rust-lang/rust/issues/154046> for more information
= help: add `#![feature(core_io)]` to the crate attributes to enable
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/lint/lint-output-format.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ LL | extern crate lint_output_format;
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

error[E0658]: use of unstable library feature `unstable_test_feature`
--> $DIR/lint-output-format.rs:7:26
--> $DIR/lint-output-format.rs:7:5
|
LL | use lint_output_format::{foo, bar};
| ^^^
| ^^^^^^^^^^^^^^^^^^
|
= help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/lint/lint-stability.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ error[E0658]: use of unstable library feature `unstable_test_feature`
--> $DIR/lint-stability.rs:194:9
|
LL | unstable_mod::deprecated();
| ^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^^^^^^^^
|
= help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
Expand All @@ -362,7 +362,7 @@ error[E0658]: use of unstable library feature `unstable_test_feature`
--> $DIR/lint-stability.rs:198:17
|
LL | let _ = Unstable::StableVariant;
| ^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^^^^
|
= help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/stability-attribute/allowed-through-unstable.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ LL | use allowed_through_unstable_core::unstable_module::OldStableTraitAllowedTh
= note: `#[warn(deprecated)]` on by default

error[E0658]: use of unstable library feature `unstable_test_feature`
--> $DIR/allowed-through-unstable.rs:9:5
--> $DIR/allowed-through-unstable.rs:9:36
|
LL | use allowed_through_unstable_core::unstable_module::NewStableTraitNotAllowedThroughUnstable;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^^^^^^^^^^^
|
= note: see issue #1 <https://github.com/rust-lang/rust/issues/1> for more information
= help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
Expand Down
16 changes: 8 additions & 8 deletions tests/ui/stability-attribute/stable-in-unstable.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,40 @@ LL | use stable_in_unstable_core::new_unstable_module;
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

error[E0658]: use of unstable library feature `unstable_test_feature`
--> $DIR/stable-in-unstable.rs:17:9
--> $DIR/stable-in-unstable.rs:17:34
|
LL | use stable_in_unstable_core::new_unstable_module::OldTrait;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^^^^^^^^^^^^^^^
|
= note: see issue #1 <https://github.com/rust-lang/rust/issues/1> for more information
= help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

error[E0658]: use of unstable library feature `unstable_test_feature`
--> $DIR/stable-in-unstable.rs:29:9
--> $DIR/stable-in-unstable.rs:29:34
|
LL | use stable_in_unstable_core::new_unstable_module::OldTrait;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^^^^^^^^^^^^^^^
|
= note: see issue #1 <https://github.com/rust-lang/rust/issues/1> for more information
= help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

error[E0658]: use of unstable library feature `unstable_test_feature`
--> $DIR/stable-in-unstable.rs:39:10
--> $DIR/stable-in-unstable.rs:39:35
|
LL | impl stable_in_unstable_core::new_unstable_module::OldTrait for LocalType {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^^^^^^^^^^^^^^^
|
= note: see issue #1 <https://github.com/rust-lang/rust/issues/1> for more information
= help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

error[E0658]: use of unstable library feature `unstable_test_feature`
--> $DIR/stable-in-unstable.rs:49:56
--> $DIR/stable-in-unstable.rs:49:34
|
LL | use stable_in_unstable_core::new_unstable_module::{OldTrait};
| ^^^^^^^^
| ^^^^^^^^^^^^^^^^^^^
|
= note: see issue #1 <https://github.com/rust-lang/rust/issues/1> for more information
= help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
Expand Down
Loading