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

Spelling and typo fixes #1810

Merged
merged 1 commit into from Apr 26, 2023

Conversation

yancyribbens
Copy link
Contributor

Fix some types in Transaction.rs and encode.rs

@dpc
Copy link
Contributor

dpc commented Apr 24, 2023

BTW. In Fedimint someone introduced https://github.com/crate-ci/typos and it's really nice - focused around low false positives, so it catches what it's confident in, and doesn't require too much maintenance. So far so good.

pub previous_output: OutPoint,
/// The script which pushes values on the stack which will cause
/// the referenced output's script to be accepted.
pub script_sig: ScriptBuf,
/// The sequence number, which suggests to miners which of two
/// conflicting transactions should be preferred, or 0xFFFFFFFF
/// to ignore this feature. This is generally never used since
/// the miner behaviour cannot be enforced.
/// the miner behavior cannot be enforced.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not gonna hold up this PR over it, but I guess we should make a crate-wide decision as to what English dialect we're using. Currently there are several instances of both behavior and behaviour in the crate.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I try to favour US English in rust-bitcoin but sometimes I forget (I use British English in my own writing usually as is typical of Australians). I think we should pick a single style. FWIW I have my editor set to US English for this reason.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK for US English from me too. (Personally I tend to use Canadian English which is a poorly-defined hybrid of US and British.)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree with US English but I'm poor at distinguishing them, so please keep that in mind. 😅 I do recognize things like behavior/behaviour and I have US English spellcheck in the browser (should figure out how to set it up in vim I guess).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm interesting, I didn't realize behaviour was the british spelling of the word. I usually default to set spell spelllang=en_us in vim which explains why it was flagged. I'd imagine The Rust language also defaults to en_us.

ACK for US English from me too. (Personally I tend to use Canadian English which is a poorly-defined hybrid of US and British.)

+1 for us_en as well.

Not gonna..

Is "gonna" an example of poorley defined Canadian English or US English :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is "gonna" an example of poorley defined Canadian English or US English :)

Lol! I actually have no idea where "gonna" is and isn't used. I haven't been everywhere in Canada and the US but nobody in the places I have been have raised their eyebrows at it.

In any case, we shouldn't use it in documentation since it's too slangy :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the word "gonna" finds its way into our rustdocs I'm going to switch to contributing as a nym out of embarrassment.

@apoelstra
Copy link
Member

CI failure is unrelated to this PR.

Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 20b812d

Copy link
Collaborator

@Kixunil Kixunil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 20b812d

Copy link
Member

@tcharding tcharding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 20b812d

@apoelstra apoelstra merged commit 967b58d into rust-bitcoin:master Apr 26, 2023
21 of 22 checks passed
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.

None yet

5 participants