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

Revert non-license changes as part of 0ebe112b #12173

Merged
merged 1 commit into from
Feb 11, 2014

Conversation

alexcrichton
Copy link
Member

The commit accidentally modified the snapshot script which changed its behavior
and is currently blocking a snapshot.

The commit accidentally modified the snapshot script which changed its behavior
and is currently blocking a snapshot.
@alexcrichton
Copy link
Member Author

The diff that I'm reverting is alexcrichton@0ebe112b#diff-1d2ff7986e29cdbb4a083e099fed93adL1 specifically

bors added a commit that referenced this pull request Feb 11, 2014
The commit accidentally modified the snapshot script which changed its behavior
and is currently blocking a snapshot.
@bors bors closed this Feb 11, 2014
@bors bors merged commit c2ae62f into rust-lang:master Feb 11, 2014
@adrientetar
Copy link
Contributor

Is it the spacing that was making it non-functional?

@alexcrichton
Copy link
Member Author

Sadly good old python and its syntactical whitespace gave different meanings to this loop: https://github.com/mozilla/rust/pull/12173/files#diff-1d2ff7986e29cdbb4a083e099fed93adL151

No worries though, my editor does weird things to files all the time and I accidentally commit them!

@alexcrichton alexcrichton deleted the fix-snap branch February 11, 2014 06:35
@adrientetar
Copy link
Contributor

Weirdness, I had standardized spacing in that file since it was a mix of 2-spaces and 4-spaces indents.

(That's really a sucky aspect of Python. Even at school when we began learning it some of the other students were confused by that "spacing is block" aspect.)

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 25, 2022
internal: completion PathKind is not optional
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 25, 2024
blocks_in_conditions: do not warn if condition comes from macro

changelog: [`blocks_in_conditions`]: do not warn if condition comes from macro

Fix rust-lang#12162
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.

4 participants