-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #89738 - eddyb:extern-crate-recursion, r=nagisa
ty::pretty: prevent infinite recursion for `extern crate` paths. Fixes #55779, fixes #87932. This fix is based on `@estebank's` idea in #55779 (comment) - but instead of trying to get `try_print_visible_def_path_recur`'s cycle detection to work in this case, this PR "just" disables the "visible path" feature when printing the path to an `extern crate`, so that the old recursion chain of `try_print_visible_def_path -> print_def_path -> try_print_visible_def_path`, is now impossible. Both tests have been confirmed to crash `rustc` because of a stack overflow, without the fix.
- Loading branch information
Showing
6 changed files
with
84 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
src/test/ui/rust-2018/uniform-paths/auxiliary/issue-55779-extern-trait.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
pub trait Trait { fn no_op(&self); } |
3 changes: 3 additions & 0 deletions
3
src/test/ui/rust-2018/uniform-paths/auxiliary/issue-87932-a.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pub trait Deserialize { | ||
fn deserialize(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
// run-pass | ||
// edition:2018 | ||
// aux-crate:issue_55779_extern_trait=issue-55779-extern-trait.rs | ||
|
||
use issue_55779_extern_trait::Trait; | ||
|
||
struct Local; | ||
struct Helper; | ||
|
||
impl Trait for Local { | ||
fn no_op(&self) | ||
{ | ||
// (Unused) extern crate declaration necessary to reproduce bug | ||
extern crate issue_55779_extern_trait; | ||
|
||
// This one works | ||
// impl Trait for Helper { fn no_op(&self) { } } | ||
|
||
// This one infinite-loops | ||
const _IMPL_SERIALIZE_FOR_HELPER: () = { | ||
// (extern crate can also appear here to reproduce bug, | ||
// as in originating example from serde) | ||
impl Trait for Helper { fn no_op(&self) { } } | ||
}; | ||
|
||
} | ||
} | ||
|
||
fn main() { } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// edition:2018 | ||
// aux-crate:issue_87932_a=issue-87932-a.rs | ||
|
||
pub struct A {} | ||
|
||
impl issue_87932_a::Deserialize for A { | ||
fn deserialize() { | ||
extern crate issue_87932_a as _a; | ||
} | ||
} | ||
|
||
fn main() { | ||
A::deserialize(); | ||
//~^ ERROR no function or associated item named `deserialize` found for struct `A` | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
error[E0599]: no function or associated item named `deserialize` found for struct `A` in the current scope | ||
--> $DIR/issue-87932.rs:13:8 | ||
| | ||
LL | pub struct A {} | ||
| ------------ function or associated item `deserialize` not found for this | ||
... | ||
LL | A::deserialize(); | ||
| ^^^^^^^^^^^ function or associated item not found in `A` | ||
| | ||
= help: items from traits can only be used if the trait is in scope | ||
help: the following trait is implemented but not in scope; perhaps add a `use` for it: | ||
| | ||
LL | use <crate::A as issue_87932_a::Deserialize>::deserialize::_a::Deserialize; | ||
| | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0599`. |