Improve macro syntax support #83
Conversation
| @@ -397,19 +397,19 @@ impl Bson { | |||
| match *self { | |||
| Bson::RegExp(ref pat, ref opt) => { | |||
| doc! { | |||
| "$regex" => (pat.clone()), | |||
There was a problem hiding this comment.
I'm so confused about git saying the first ')' was removed here but the second below
src/bson.rs
Outdated
| @@ -397,19 +397,19 @@ impl Bson { | |||
| match *self { | |||
| Bson::RegExp(ref pat, ref opt) => { | |||
| doc! { | |||
| "$regex" => (pat.clone()), | |||
| "$options" => (opt.clone()) | |||
| "$regex" => pat.clone(), | |||
There was a problem hiding this comment.
Out of curiosity, why remove the parens/add trailing commas but not switch the "=>" to ":"? Is this a rustfmt thing?
There was a problem hiding this comment.
nope, just made these changes before I re-added colon support. i'll change these.
| /// # | ||
| /// # fn main() { | ||
| /// let value = bson!({ | ||
| /// "code": 200, |
There was a problem hiding this comment.
Do we want to document the "=>" syntax, or are we considering that discouraged (but kept around for compatibility)?
There was a problem hiding this comment.
Considering it discouraged in favor of consistency, but here for backwards-compatibility.
| #[macro_export] | ||
| macro_rules! bson { | ||
| ([]) => {{ $crate::Bson::Array(Vec::new()) }}; | ||
| ////////////////////////////////////////////////////////////////////////// |
There was a problem hiding this comment.
I assume these comments are also lifted from serde_json?
There was a problem hiding this comment.
yeah; not sure where the line falls in terms of fair usage.
tests/lib.rs
Outdated
| "doc" => { | ||
| "fish" => "in", | ||
| "a" => "barrel", | ||
| "!" => 1 | ||
| "!" => 1, |
There was a problem hiding this comment.
Is the trailing comma required? If not, we should probably add a separate test for without it (both nested and top-level)
tests/lib.rs
Outdated
| "doc": { | ||
| "fish": "in", | ||
| "a": "barrel", | ||
| "!": 1, |
There was a problem hiding this comment.
Ditto above about additional tests for without trailing commas
|
LGTM |
|
@zonyitoo ready for a publish. thanks 🙏 |
|
Published v0.10.0 |
What
Overhauls the bson/doc macro definitions to support syntactic sugar available in the
json!macro:.charactersnullkeywordHow
By taking serde's
json!macro and making a couple changes (including overloaded support for rocket separators for backwards-compatibility), and some simplifications (removing redundant boolean cases, etc). I ran the mongo driver tests with this branch ofbsonand they all passed, which is convincing enough for me (along with our bson-rs tests) that we don't have any regressions.Who
@zonyitoo, @saghm