Merge branch origin/master into origin/enum

Browse Source

Conflicts:
    serde/src/de/mod.rs
    serde_codegen/src/de.rs
    testing/tests/test_bytes.rs

...

This commit is contained in:

David Tolnay

2017-01-08 00:23:58 -08:00

parent 85f1bf0259 ad34c14c8c

commit bf873a7b3f

65 changed files with 1933 additions and 4520 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

serde_codegen/src/de.rs

+432 -561

File diff suppressed because it is too large Load Diff