Skip to content

Small typo - #12775

Closed
thecoderman wants to merge 2 commits into
rust-lang:masterfrom
thecoderman:master
Closed

Small typo#12775
thecoderman wants to merge 2 commits into
rust-lang:masterfrom
thecoderman:master

Conversation

@thecoderman

Copy link
Copy Markdown

Just a small typo I felt like fixing.

@thecoderman

Copy link
Copy Markdown
Author

I'm probably missing something, but I don't understand why the build failed after changing one word.

@adrientetar

Copy link
Copy Markdown
Contributor

Seems like it passed just now (there can be spurious failures on the test bots at times). Can you squash your commits?

@thecoderman

Copy link
Copy Markdown
Author

Sorry, I'm new to Git and couldn't figure how to squash my commit after reading the stack overflow question. I'll go read about git at git-scm.com and submit actual bugs later. I've deleted my repo. Again, sorry.

@adrientetar

Copy link
Copy Markdown
Contributor

I think this should do it:

git reset 7870163 # reset to the first commit
git add --all # track all objects
git commit --amend # add them to the current commit

The stackoverflow solution doesn't work because you didn't create a separate branch to push your changes. However, I suspect this would work:

git rebase -i HEAD^ # `HEAD^` is the commit before the latest one

@alexcrichton

Copy link
Copy Markdown
Member

Closing temporarily, I think this PR is confusing bors.

@alexcrichton

Copy link
Copy Markdown
Member

Could you reopen with a new PR? This was apparently confusing bors sadly.

@adrientetar

Copy link
Copy Markdown
Contributor

That's really weird. Has it been investigated already? It has happened in the past. Is bors stalled?

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 25, 2022
fix: Improve syntax fixup a bit, handle incomplete `if`

- allow appending tokens after a token, not just a node
- allow inserting delimiters (and remove them again)
- fix up `if {}` and `if` without anything following
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 13, 2024
… r=xFrednet

Handle single chars with `to_string()` for `single_char_add_str`

Add support for single chars / literals with `to_string()` call for `push_str()` and `insert_str()`.

changelog: [`single_char_add_str`]: handle single chars with `to_string()` call

Closes rust-lang#12775
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants