Skip to content

Commit

Permalink
Merge pull request #345 from sadnessOjisan/feature/translate-wiki-to-ja
Browse files Browse the repository at this point in the history
Translate wiki docs into Japanese, and add a link to README
  • Loading branch information
Marwes committed Apr 27, 2022
2 parents 50a71af + 8208044 commit f9f5548
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,20 @@ let result = parser.parse("Pick up that word!");
assert_eq!(result, Ok((Some("word".to_string()), "!")));
```

A tutorial as well as explanations on what goes on inside combine can be found in [the wiki](https://github.com/Marwes/combine/wiki).

Larger examples can be found in the [examples][], [tests][] and [benches][] folders.

[examples]:https://github.com/Marwes/combine/tree/master/examples
[tests]:https://github.com/Marwes/combine/tree/master/tests
[benches]:https://github.com/Marwes/combine/tree/master/benches

## Tutorial

A tutorial as well as explanations on what goes on inside combine can be found in [the wiki](https://github.com/Marwes/combine/wiki).

### Translation

[Japanese](https://github.com/sadnessOjisan/combine-ja)

## Links

[Documentation and examples](https://docs.rs/crate/combine)
Expand Down
10 changes: 5 additions & 5 deletions src/stream/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@ where
/// },
/// |input, _position| combine::easy::Stream::from(input),
/// ).map_err(combine::easy::Errors::<u8, &[u8], _>::from),
/// Ok(819),
/// Ok(824),
/// );
/// ```
#[cfg(feature = "std")]
Expand Down Expand Up @@ -1497,7 +1497,7 @@ macro_rules! decode {
/// },
/// |input, _position| combine::easy::Stream::from(input),
/// ).map_err(combine::easy::Errors::<u8, &[u8], _>::from),
/// Ok(819),
/// Ok(824),
/// );
/// }
/// ```
Expand Down Expand Up @@ -1591,7 +1591,7 @@ macro_rules! decode_futures_03 {
/// },
/// |input, _position| combine::easy::Stream::from(input),
/// ).map_err(combine::easy::Errors::<u8, &[u8], _>::from),
/// Ok(819),
/// Ok(824),
/// );
/// }
/// ```
Expand Down Expand Up @@ -1687,7 +1687,7 @@ macro_rules! decode_tokio_02 {
/// },
/// |input, _position| combine::easy::Stream::from(input),
/// ).map_err(combine::easy::Errors::<u8, &[u8], _>::from),
/// Ok(819),
/// Ok(824),
/// );
/// }
/// ```
Expand Down Expand Up @@ -1783,7 +1783,7 @@ macro_rules! decode_tokio_03 {
/// },
/// |input, _position| combine::easy::Stream::from(input),
/// ).map_err(combine::easy::Errors::<u8, &[u8], _>::from),
/// Ok(819),
/// Ok(824),
/// );
/// }
/// ```
Expand Down
4 changes: 2 additions & 2 deletions tests/async.rs
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ fn skip_count_min_max_test() {
assert_eq!(result.unwrap(), [""]);
}

const WORDS_IN_README: usize = 819;
const WORDS_IN_README: usize = 824;

#[test]
fn decode_std() {
Expand Down Expand Up @@ -850,5 +850,5 @@ async fn decode_loop() {
}
}
}
assert_eq!(819, count);
assert_eq!(824, count);
}

0 comments on commit f9f5548

Please sign in to comment.