Skip to content

Update to use Rust 1.34 #1

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.

Sign up for GitHub

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

Merged
evq merged 2 commits into from
Mar 23, 2019
Merged

Update to use Rust 1.34 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe1ff31
rustfmt
maur1th Mar 17, 2019
611c8f7
Update to use Rust 1.34
maur1th Mar 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["eV <[email protected]>"]
name = "molysite"
version = "0.1.0"
edition = "2018"

[dependencies.nom]
features = ["nightly"]
version = "^3.2"
[dependencies]
nom = "^3.2"
19 changes: 11 additions & 8 deletions src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ named!(pub boolean<bool>,
)
);

named!(unsigned_float, recognize!(alt_complete!(
delimited!(digit, tag!("."), opt!(complete!(digit))) |
delimited!(opt!(digit), tag!("."), digit) |
digit
)));
named!(
unsigned_float,
recognize!(alt_complete!(
delimited!(digit, tag!("."), opt!(complete!(digit)))
| delimited!(opt!(digit), tag!("."), digit)
| digit
))
);

named!(pub float<f32>, map_res!(
map_res!(
Expand All @@ -32,8 +35,8 @@ named!(pub float<f32>, map_res!(
FromStr::from_str
));

fn to_i(i: &str) -> Result<u32, ParseIntError> {
u32::from_str_radix(i, 16)
fn to_i(i: &str) -> Result<u32, ParseIntError> {
u32::from_str_radix(i, 16)
}

named!(pub int<u32>, map_res!(
Expand All @@ -43,7 +46,7 @@ named!(pub int<u32>, map_res!(
),
to_i
));

// TODO: add support for octal
named!(pub number<f32>, alt_complete!(
map!(int, |i| { i as f32 }) |
Expand Down
Loading