Skip to content
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.

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

Unpublicize JSON reexports, unprefix JSON type aliases #19224

Merged
merged 1 commit into from
Nov 27, 2014

Conversation

frewsxcv
Copy link
Member

Addressing the issues brought up in this thread

This pull request:

  • Unpublicizes reexports
  • Renames type aliases:
    • json::JsonArrayjson::Array
    • json::JsonObjectjson::Object

@sfackler
Copy link
Member

cc @aturon

@alexcrichton
Copy link
Member

Can you make sure to word the commit message in accordance with our breaking changes policy? This seems ok to me, cc #19253.

@frewsxcv
Copy link
Member Author

@alexcrichton Ah, was not aware of that policy. Will rename now

@alexcrichton
Copy link
Member

No worries, thanks @frewsxcv!

@frewsxcv frewsxcv force-pushed the unprefix-json-types branch from 9f3b64d to 5646221 Compare November 24, 2014 00:35
@frewsxcv
Copy link
Member Author

Look alright @alexcrichton ?

@frewsxcv frewsxcv changed the title Remove JSON reexports, unprefix JSON type aliases Unpublicize JSON reexports, unprefix JSON type aliases Nov 24, 2014
@frewsxcv frewsxcv force-pushed the unprefix-json-types branch from 5646221 to 482111a Compare November 24, 2014 15:29
@frewsxcv
Copy link
Member Author

Had a stupid error, fixed it, squashed it

Some(U64Value(n)) => Ok(U64(n)),
Some(F64Value(n)) => Ok(F64(n)),
Some(BooleanValue(b)) => Ok(Boolean(b)),
return match self.token {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Don't need the return here.)

The type aliases json::JsonString and json::JsonObject were originally
prefixed with 'json' to prevent collisions with (at the time) the enums
json::String and json::Object respectively. Now that enum namespacing
has landed, this 'json' prefix is redundant and can be removed:

json::JsonArray -> json::Array
json::JsonObject -> json::Object

In addition, this commit also unpublicizes all of the re-exports in this
JSON module, as a part of rust-lang#19253

[breaking-change]
@frewsxcv frewsxcv force-pushed the unprefix-json-types branch from 482111a to ce238d7 Compare November 26, 2014 16:20
@frewsxcv
Copy link
Member Author

Okay, more stupid errors. I guess I didn't run the tests last time? Let's hope third times the charm

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Nov 27, 2014
Addressing the issues brought up in [this thread](rust-lang#19114 (comment))

This pull request:

* Unpublicizes reexports
* Renames type aliases:
 * `json::JsonArray` ☞ `json::Array`
 * `json::JsonObject` ☞ `json::Object`
@bors bors merged commit ce238d7 into rust-lang:master Nov 27, 2014
@frewsxcv frewsxcv deleted the unprefix-json-types branch October 2, 2016 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants