Add extension support and first extension, unwrap_newtypes by torkleyy · Pull Request #72 · ron-rs/ron

torkleyy · 2018-01-16T20:17:38Z

TODO

More tests, especially regarding error handling
discuss TODOs / design
~~docs for extensions~~ (postponed)
add syntax to Sublime plugin

Fixes

Fixes #69

torkleyy · 2018-01-16T20:22:39Z

                ParseError::ExpectedArray => "Expected array",
                ParseError::ExpectedArrayEnd => "Expected end of array",
+                ParseError::ExpectedAttribute => "Expected an enable attribute",
+                ParseError::ExpectedAttributeEnd => "Expected a closing `]` after the attribute",


Ah, this could also fail if ) is missing. The error message should reflect that.

kvark · 2018-01-16T21:51:37Z

    ) -> Result<V::Value>
        where V: Visitor<'de>
    {
+        if Extension::unwrap_newtypes(self.bytes.exts) {


if the set of extensions is known at compile time, any reason we don't do something like if self.extensions.contains(Extension::UNWRAP_NEWTYPES) {..}?

torkleyy · 2018-01-17T05:29:53Z

I don't see which contains method you want me to use? The extensions are stored in a usize.

torkleyy · 2018-01-17T14:12:34Z

bors try

bors · 2018-01-17T14:14:40Z

try

Build succeeded

continuous-integration/travis-ci/push

torkleyy · 2018-01-17T14:40:06Z

 scope: source.ron
 contexts:
  main:
+    # extensions


This could be done better, but I think it's sufficient. Could you try it out with your editor?

I tested it. Seems to work fine.

torkleyy · 2018-01-17T14:57:45Z

r? @kvark

Please also check the syntax file, I didn't check it!

kvark

Almost there!

kvark · 2018-01-17T16:16:21Z

+fn multiple_attributes() {
+    #[derive(Debug, Deserialize, PartialEq)]
+    struct New(String);
+    let de: Result<New> = from_str("#![enable(unwrap_newtypes)] #![enable(unwrap_newtypes)] \"Hello\"");


this is not supported by the syntax highlighter, I think
Can we require the features to always come as a list in a single pragma? e.g. #![enable(feature1, feature2)]

I think it is supported? It should match against the same pattern twice.

kvark · 2018-01-17T16:17:00Z

+            .map(|elem| {
+                if self.consume(elem) {
+                    self.skip_ws();
+


weird newline

Personal style, I always make a newline before the return value.

kvark · 2018-01-17T16:35:47Z

bors r+

72: Add extension support and first extension, unwrap_newtypes r=kvark a=torkleyy ## TODO * [x] More tests, especially regarding error handling * [x] discuss TODOs / design * [x] ~~docs for extensions~~ (postponed) * [x] add syntax to Sublime plugin ## Fixes Fixes #69

bors · 2018-01-17T16:38:55Z

Canceled

torkleyy · 2018-01-17T16:39:32Z

Just noticed two nits and fixed them.

bors r=kvark

72: Add extension support and first extension, unwrap_newtypes r=kvark a=torkleyy ## TODO * [x] More tests, especially regarding error handling * [x] discuss TODOs / design * [x] ~~docs for extensions~~ (postponed) * [x] add syntax to Sublime plugin ## Fixes Fixes #69

bors · 2018-01-17T16:41:57Z

Build succeeded

continuous-integration/travis-ci/push

Boscop · 2020-07-01T20:36:53Z

@torkleyy The syntax highlighting in Sublime is messed up as soon as I add attributes:

kvark · 2020-07-02T14:11:23Z

Could you file that on https://github.com/ron-rs/sublime-ron please?

Boscop · 2020-07-03T07:46:14Z

Done: ron-rs/sublime-ron#6

torkleyy added the working label Jan 16, 2018

torkleyy commented Jan 16, 2018

View reviewed changes

kvark approved these changes Jan 17, 2018

View reviewed changes

bors Bot added a commit that referenced this pull request Jan 17, 2018

Try #72:

db47afe

Add extension support and first extension, unwrap_newtypes

79c5394

torkleyy force-pushed the ext branch from 4d04c65 to 79c5394 Compare January 17, 2018 14:15

Be more permissive about whitespace, add extensions to sublime file

7ddd388

torkleyy commented Jan 17, 2018

View reviewed changes

kvark mentioned this pull request Jan 17, 2018

Merge back with RON proper rson-rs/rson#3

Open

More permissive, more tests

69bc456

torkleyy removed the working label Jan 17, 2018

Use bitflags crate for the Extensions

363e235

torkleyy added the enhancement label Jan 17, 2018

kvark approved these changes Jan 17, 2018

View reviewed changes

Fix two minor nits

7af3994

bors Bot merged commit 7af3994 into ron-rs:master Jan 17, 2018

torkleyy deleted the ext branch January 17, 2018 16:43

ozkriff mentioned this pull request Jan 18, 2018

RON: Use implicit_some and unwrap_newtypes extensions ozkriff/zemeroth#187

Closed

kvark mentioned this pull request May 13, 2020

Auto Some-wrapping of Option<T> config values #231

Closed

Boscop mentioned this pull request Jul 1, 2020

Avoiding duplicate parens around enum variant members (related to newtype-wrapping) #250

Closed

kvark mentioned this pull request Nov 19, 2020

Support UNWRAP_NEWTYPES in the serializer #284

Closed

Conversation

torkleyy commented Jan 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TODO

Fixes

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

torkleyy commented Jan 17, 2018 via email

Uh oh!

torkleyy commented Jan 17, 2018

Uh oh!

bors Bot commented Jan 17, 2018

try

Build succeeded

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

torkleyy commented Jan 17, 2018

Uh oh!

kvark left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kvark commented Jan 17, 2018

Uh oh!

bors Bot commented Jan 17, 2018

Canceled

Uh oh!

torkleyy commented Jan 17, 2018

Uh oh!

bors Bot commented Jan 17, 2018

Build succeeded

Uh oh!

Boscop commented Jul 1, 2020

Uh oh!

kvark commented Jul 2, 2020

Uh oh!

Boscop commented Jul 3, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

torkleyy commented Jan 16, 2018 •

edited

Loading