Skip to content

Commit 2c46f4f

Browse files
committed
Merge branch 'combine'
* combine: fixed earlier problem started name; but parse is failing add operation type parser format; cleanup more setup fix is_clr note macros macros macros initial trying with combine; eww types
2 parents 07b782a + 31b7eba commit 2c46f4f

File tree

5 files changed

+224
-98
lines changed

5 files changed

+224
-98
lines changed

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# top most
2+
root = true
3+
4+
[*]
5+
end_of_line = lf
6+
insert_final_newline = true
7+
charset = utf-8
8+
indent_style = space
9+
indent_size = 2

.rustfmt.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
tab_spaces = 2
2+
max_width = 120
3+
ideal_width = 80

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ authors = ["Nicholas Dujay <nickdujay@gmail.com>"]
55

66
[dependencies]
77
chomp = "*"
8+
combine ="*"

src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
#![feature(conservative_impl_trait)]
2+
13
#[macro_use]
24
extern crate chomp;
35

6+
extern crate combine;
7+
48
pub mod parser;

0 commit comments

Comments
 (0)