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 issue #68008 #68023

Merged
merged 1 commit into from
Jan 9, 2020
Merged

Fix issue #68008 #68023

merged 1 commit into from
Jan 9, 2020

Conversation

FSciammarella
Copy link
Contributor

@FSciammarella FSciammarella commented Jan 8, 2020

Correcting Typo on error message. From "substract" to "subtract".

Fixes #68008.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @matthewjasper (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2020
@JohnTitor
Copy link
Member

It'd be nice that you include Fixes #68008 in the description so that we can close that issue once this is merged.

@Centril
Copy link
Contributor

Centril commented Jan 8, 2020

r? @Centril @bors r+

@bors
Copy link
Contributor

bors commented Jan 8, 2020

📌 Commit 7da8c22bc2308c147470bab98488da1d53265dd6 has been approved by Centril

@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 Jan 8, 2020
@varkor
Copy link
Member

varkor commented Jan 8, 2020

@FSciammarella: if you could squash these three changes into a single commit, that'd be even better, as that way related changes are grouped when looking through the repository history!

@FSciammarella
Copy link
Contributor Author

FSciammarella commented Jan 8, 2020

I think I messed up. I tried squashing the commits, but added 3 other commits unrelated to this PR in the history. @varkor Is there some way to revert this or do I need to close this PR and open a new one?

EDIT: Think I fixed it?

Fix Typo on hir::BinOpKind::Sub

"substract" to "subtract"

Fix Typo on "Error cannot substract"

Fix Typo on cannot "substract"
@varkor
Copy link
Member

varkor commented Jan 8, 2020

@FSciammarella: perfect, thanks!

@bors r=Centril,varkor rollup

@bors
Copy link
Contributor

bors commented Jan 8, 2020

📌 Commit 7de174b has been approved by Centril,varkor

Centril added a commit to Centril/rust that referenced this pull request Jan 8, 2020
Fix issue rust-lang#68008

Correcting Typo on error message. From "substract" to "subtract".

Fixes rust-lang#68008.
bors added a commit that referenced this pull request Jan 9, 2020
Rollup of 12 pull requests

Successful merges:

 - #67630 (Treat extern statics just like statics in the "const pointer to static" representation)
 - #67747 (Explain that associated types and consts can't be accessed directly on the trait's path)
 - #67884 (Fix incremental builds of core by allowing unused attribute.)
 - #67966 (Use matches macro in libcore and libstd)
 - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup)
 - #67986 (Display more informative ICE)
 - #67990 (slice patterns: harden match-based borrowck tests)
 - #68005 (Improve E0184 explanation)
 - #68009 (Spell check librustc_error_codes)
 - #68023 (Fix issue #68008)
 - #68024 (Remove `-Z continue-parse-after-error`)
 - #68026 (Small improvements in lexical_region_resolve)

Failed merges:

r? @ghost
@bors bors merged commit 7de174b into rust-lang:master Jan 9, 2020
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.

Typo on error E0369 description text
7 participants