Skip to content

Commit 62d11df

Browse files
committed
Merge #813: Fix typos: occurrence, occurred, restricted
e4bdf22 Update context.rs (leopardracer) 70876ab Update key.rs (leopardracer) a380044 Update error.rs (leopardracer) Pull request description: This PR fixes several typos across the codebase: - src/descriptor/key.rs: Fix "occurence" -> "occurrence" - src/expression/error.rs: Fix "occured" -> "occurred" - src/miniscript/context.rs: Fix "restrcted" -> "restricted" (in two places) These are simple spelling corrections that don't affect functionality. ACKs for top commit: apoelstra: ACK e4bdf22; successfully ran local tests; you are correct about "occurrence"; I had to look it up :) Tree-SHA512: 0868de782d6bd9b2ca204f56aef425d1060f262203d416e85ab05e2705b8d24a917057fd3f05edb1746014cf0c339eed423b242a8554762489a0159eff7e3549
2 parents b7d5582 + e4bdf22 commit 62d11df

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/descriptor/key.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ fn parse_xkey_deriv<Key>(
10251025
// BIP389 defines a new step in the derivation path. This step contains two or more
10261026
// derivation indexes in the form '<1;2;3';4h;5H;6>'.
10271027
if p.starts_with('<') && p.ends_with('>') {
1028-
// There may only be one occurence of this step.
1028+
// There may only be one occurrence of this step.
10291029
if multipath {
10301030
return Some(Err(DescriptorKeyParseError::MalformedKeyData(
10311031
MalformedKeyDataKind::MultipleDerivationPathIndexSteps,

src/expression/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ impl fmt::Display for ParseTreeError {
159159
ParseTreeError::MultipleSeparators { separator, pos } => {
160160
write!(
161161
f,
162-
"separator '{}' occured multiple times (second time at position {})",
162+
"separator '{}' occurred multiple times (second time at position {})",
163163
separator, pos
164164
)
165165
}

src/miniscript/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ where
200200
/// 3600 or number of stack elements are more than 100.
201201
fn check_witness(_witness: &[Vec<u8>]) -> Result<(), ScriptContextError> {
202202
// Only really need to do this for segwitv0 and legacy
203-
// Bare is already restrcited by standardness rules
203+
// Bare is already restricted by standardness rules
204204
// and would reach these limits.
205205
Ok(())
206206
}
@@ -895,7 +895,7 @@ impl ScriptContext for NoChecks {
895895

896896
fn check_witness(_witness: &[Vec<u8>]) -> Result<(), ScriptContextError> {
897897
// Only really need to do this for segwitv0 and legacy
898-
// Bare is already restrcited by standardness rules
898+
// Bare is already restricted by standardness rules
899899
// and would reach these limits.
900900
Ok(())
901901
}

0 commit comments

Comments
 (0)