Skip to content
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.

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

fix typo in compile_fail doctest #87183

Merged
merged 1 commit into from
Jul 18, 2021
Merged

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 16, 2021

Fixes a typo introduced by #86211. For some reason this typo makes Miri go all crazy when running libcore doctests (rust-lang/miri#1852). Kudos to @hyd-dev for noticing the typo.

Cc @tlyu @joshtriplett

@rust-highfive
Copy link
Collaborator

r? @scottmcm

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 16, 2021
@tlyu
Copy link
Contributor

tlyu commented Jul 16, 2021

Thanks! I would have hoped that the ordinary doctest pass would have caught that, especially given the error code number.

@RalfJung
Copy link
Member Author

I assume the error code number ensures that this error code is present, but does not prevent other errors from also being present.

@jyn514
Copy link
Member

jyn514 commented Jul 17, 2021

@bors r+ rollup

It seems unfortunate that Miri gets so confused on name errors, but you're already aware of that and this is a good fix anyway.

@bors
Copy link
Contributor

bors commented Jul 17, 2021

📌 Commit 0d3d6f0 has been approved by jyn514

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 17, 2021
@RalfJung
Copy link
Member Author

Yes, that is tracked at rust-lang/miri-test-libstd#4. (It's not really a Miri bug, more an unfortunate consequence of rustc's behavior when suggesting alternative names [eagerly loading all the crates it can find], and the hacky way we use to execute libcore doctests without x.py.)

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 17, 2021
fix typo in compile_fail doctest

Fixes a typo introduced by rust-lang#86211. For some reason this typo makes Miri go all crazy when running libcore doctests (rust-lang/miri#1852). Kudos to `@hyd-dev` for noticing the typo.

Cc `@tlyu` `@joshtriplett`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#86763 (Add a regression test for issue-63355)
 - rust-lang#86814 (Recover from a misplaced inner doc comment)
 - rust-lang#86843 (Check that const parameters of trait methods have compatible types)
 - rust-lang#86889 (rustdoc: Cleanup ExternalCrate)
 - rust-lang#87092 (Remove nondeterminism in multiple-definitions test)
 - rust-lang#87170 (Add diagnostic items for Clippy)
 - rust-lang#87183 (fix typo in compile_fail doctest)
 - rust-lang#87205 (rustc_middle: remove redundant clone)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c1ee9a3 into rust-lang:master Jul 18, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 18, 2021
@RalfJung RalfJung deleted the option-doctest branch July 18, 2021 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants