From 88b5b3f1ec91a0803e017cf1d42ab87f4cb36c51 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Wed, 14 Sep 2016 14:43:31 -0400 Subject: [PATCH] lib & contrib: update imports MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- benchmarks/json/scripts/nitcc_parser.nit | 2 +- contrib/benitlux/src/client/base.nit | 2 +- .../benitlux/src/server/benitlux_controller.nit | 2 +- contrib/neo_doxygen/src/model/descriptions.nit | 1 + contrib/neo_doxygen/src/model/location.nit | 1 + contrib/refund/src/refund_json.nit | 1 + contrib/shibuqam/examples/shibuqamoauth.nit | 2 +- contrib/tinks/src/client/linux_client.nit | 2 +- contrib/tnitter/src/action.nit | 2 +- contrib/tnitter/src/push.nit | 2 +- contrib/tnitter/src/tnitter_app.nit | 2 +- examples/rosettacode/json_output.nit | 1 + lib/android/bundle/bundle.nit | 2 +- lib/android/intent/intent_api10.nit | 2 +- .../shared_preferences_api10.nit | 2 +- lib/app/http_request.nit | 2 +- lib/github/api.nit | 2 +- lib/github/events.nit | 2 +- lib/github/github_curl.nit | 1 + lib/ios/data_store.nit | 2 +- lib/json/store.nit | 1 + lib/linux/data_store.nit | 2 +- lib/mongodb/mongodb.nit | 1 + lib/mpi/mpi.nit | 2 +- lib/neo4j/curl_json.nit | 1 + lib/neo4j/error.nit | 1 + lib/nitcorn/restful.nit | 2 +- lib/popcorn/pop_handlers.nit | 1 + lib/popcorn/pop_repos.nit | 2 +- lib/popcorn/pop_validation.nit | 2 +- lib/serialization/README.md | 2 +- src/doc/doc_phases/doc_indexing.nit | 1 + src/doc/html_templates/html_components.nit | 2 +- src/examples/nitwebcrawl.nit | 2 +- src/model/model_json.nit | 1 + tests/test_json_deserialization.nit | 2 +- tests/test_json_deserialization_heuristic.nit | 2 +- tests/test_json_deserialization_plain.nit | 2 +- tests/test_json_unicode.nit | 1 + tests/test_serialization.nit | 2 +- 40 files changed, 40 insertions(+), 27 deletions(-) diff --git a/benchmarks/json/scripts/nitcc_parser.nit b/benchmarks/json/scripts/nitcc_parser.nit index f09b746..627ae39 100644 --- a/benchmarks/json/scripts/nitcc_parser.nit +++ b/benchmarks/json/scripts/nitcc_parser.nit @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json +import json::static var text = args.first.to_path.read_all var json = text.parse_json diff --git a/contrib/benitlux/src/client/base.nit b/contrib/benitlux/src/client/base.nit index 7cfde72..28b4c88 100644 --- a/contrib/benitlux/src/client/base.nit +++ b/contrib/benitlux/src/client/base.nit @@ -19,7 +19,7 @@ import app::ui import app::data_store import app::http_request import android::aware -import json::serialization +import json import benitlux_model import translations diff --git a/contrib/benitlux/src/server/benitlux_controller.nit b/contrib/benitlux/src/server/benitlux_controller.nit index 5649345..a2ab392 100644 --- a/contrib/benitlux/src/server/benitlux_controller.nit +++ b/contrib/benitlux/src/server/benitlux_controller.nit @@ -19,7 +19,7 @@ module benitlux_controller import nitcorn import nitcorn::restful -private import json::serialization +private import json import benitlux_model import benitlux_db diff --git a/contrib/neo_doxygen/src/model/descriptions.nit b/contrib/neo_doxygen/src/model/descriptions.nit index 5a27553..58ef0e6 100644 --- a/contrib/neo_doxygen/src/model/descriptions.nit +++ b/contrib/neo_doxygen/src/model/descriptions.nit @@ -16,6 +16,7 @@ module model::descriptions import json::static +import json # Documentation associated to an entity. # diff --git a/contrib/neo_doxygen/src/model/location.nit b/contrib/neo_doxygen/src/model/location.nit index 46551a8..d5f3727 100644 --- a/contrib/neo_doxygen/src/model/location.nit +++ b/contrib/neo_doxygen/src/model/location.nit @@ -16,6 +16,7 @@ module location import json::static +import json # A location inside a source file. class Location diff --git a/contrib/refund/src/refund_json.nit b/contrib/refund/src/refund_json.nit index 7c5e4d0..f670f9d 100644 --- a/contrib/refund/src/refund_json.nit +++ b/contrib/refund/src/refund_json.nit @@ -19,6 +19,7 @@ module refund_json import refund_base import json::static +import json redef class RefundProcessor diff --git a/contrib/shibuqam/examples/shibuqamoauth.nit b/contrib/shibuqam/examples/shibuqamoauth.nit index 4645eca..bda76a3 100644 --- a/contrib/shibuqam/examples/shibuqamoauth.nit +++ b/contrib/shibuqam/examples/shibuqamoauth.nit @@ -172,7 +172,7 @@ module shibuqamoauth import popcorn import shibuqam -import json::serialization +import json redef class HttpRequest # percent decoded get or post parameter. diff --git a/contrib/tinks/src/client/linux_client.nit b/contrib/tinks/src/client/linux_client.nit index bd60702..5e7cca4 100644 --- a/contrib/tinks/src/client/linux_client.nit +++ b/contrib/tinks/src/client/linux_client.nit @@ -17,7 +17,7 @@ module linux_client import mnit::linux import linux::audio -import json::serialization +import json import client diff --git a/contrib/tnitter/src/action.nit b/contrib/tnitter/src/action.nit index 60ee384..f567294 100644 --- a/contrib/tnitter/src/action.nit +++ b/contrib/tnitter/src/action.nit @@ -18,7 +18,7 @@ module action import nitcorn -import json::serialization +import json import model import database diff --git a/contrib/tnitter/src/push.nit b/contrib/tnitter/src/push.nit index bc47789..9900cfa 100644 --- a/contrib/tnitter/src/push.nit +++ b/contrib/tnitter/src/push.nit @@ -16,7 +16,7 @@ module push import nitcorn -import json::serialization +import json import model import database diff --git a/contrib/tnitter/src/tnitter_app.nit b/contrib/tnitter/src/tnitter_app.nit index cf1d162..8218004 100644 --- a/contrib/tnitter/src/tnitter_app.nit +++ b/contrib/tnitter/src/tnitter_app.nit @@ -31,7 +31,7 @@ import app::ui import app::http_request import app::data_store import android::aware -import json::serialization +import json import model diff --git a/examples/rosettacode/json_output.nit b/examples/rosettacode/json_output.nit index 59fb72b..800a310 100644 --- a/examples/rosettacode/json_output.nit +++ b/examples/rosettacode/json_output.nit @@ -7,6 +7,7 @@ # SEE: module json_output +import json::static import json var str = """{ diff --git a/lib/android/bundle/bundle.nit b/lib/android/bundle/bundle.nit index 82acbec..e02702a 100644 --- a/lib/android/bundle/bundle.nit +++ b/lib/android/bundle/bundle.nit @@ -19,7 +19,7 @@ module bundle import serialization -import json::serialization +import json import platform import activities diff --git a/lib/android/intent/intent_api10.nit b/lib/android/intent/intent_api10.nit index 746c0c4..f9e6c3b 100644 --- a/lib/android/intent/intent_api10.nit +++ b/lib/android/intent/intent_api10.nit @@ -21,7 +21,7 @@ module intent_api10 import dalvik import android::bundle import serialization -private import json::serialization +private import json in "Java" `{ import android.content.Intent; diff --git a/lib/android/shared_preferences/shared_preferences_api10.nit b/lib/android/shared_preferences/shared_preferences_api10.nit index b268087..f17661f 100644 --- a/lib/android/shared_preferences/shared_preferences_api10.nit +++ b/lib/android/shared_preferences/shared_preferences_api10.nit @@ -19,7 +19,7 @@ module shared_preferences_api10 import dalvik import serialization -private import json::serialization +private import json in "Java" `{ import android.content.SharedPreferences; diff --git a/lib/app/http_request.nit b/lib/app/http_request.nit index 3fc48c6..0260cab 100644 --- a/lib/app/http_request.nit +++ b/lib/app/http_request.nit @@ -17,7 +17,7 @@ module http_request import app_base import pthreads -import json::serialization +import json import linux::http_request is conditional(linux) import android::http_request is conditional(android) diff --git a/lib/github/api.nit b/lib/github/api.nit index e42faf5..8bd1ee3 100644 --- a/lib/github/api.nit +++ b/lib/github/api.nit @@ -20,7 +20,7 @@ module api import github_curl -intrude import json::serialization +intrude import json::serialization_read # Client to Github API # diff --git a/lib/github/events.nit b/lib/github/events.nit index b8c004a..3417de2 100644 --- a/lib/github/events.nit +++ b/lib/github/events.nit @@ -18,7 +18,7 @@ module events import api -intrude import json::serialization +intrude import json # Github event stub. class GithubEvent diff --git a/lib/github/github_curl.nit b/lib/github/github_curl.nit index 05761b1..f2d5737 100644 --- a/lib/github/github_curl.nit +++ b/lib/github/github_curl.nit @@ -18,6 +18,7 @@ module github_curl import curl import json::static +import json # Specific Curl that know hot to talk to the github API class GithubCurl diff --git a/lib/ios/data_store.nit b/lib/ios/data_store.nit index 6d1579d..a06586c 100644 --- a/lib/ios/data_store.nit +++ b/lib/ios/data_store.nit @@ -17,7 +17,7 @@ module data_store import app::data_store import cocoa::foundation -private import json::serialization +private import json redef class App redef var data_store = new UserDefaultView diff --git a/lib/json/store.nit b/lib/json/store.nit index 42a04df..b8ce0f9 100644 --- a/lib/json/store.nit +++ b/lib/json/store.nit @@ -90,6 +90,7 @@ module store import static +import json # A JsonStore can save and load json data from file system. class JsonStore diff --git a/lib/linux/data_store.nit b/lib/linux/data_store.nit index 4d7ff2b..5924822 100644 --- a/lib/linux/data_store.nit +++ b/lib/linux/data_store.nit @@ -20,7 +20,7 @@ module data_store import app::data_store private import xdg_basedir private import sqlite3 -private import json::serialization +private import json redef class App redef var data_store = new LinuxStore diff --git a/lib/mongodb/mongodb.nit b/lib/mongodb/mongodb.nit index 80c4d4c..17b137f 100644 --- a/lib/mongodb/mongodb.nit +++ b/lib/mongodb/mongodb.nit @@ -42,6 +42,7 @@ # ~~~ module mongodb +import json::static import json private import native_mongodb diff --git a/lib/mpi/mpi.nit b/lib/mpi/mpi.nit index bc47997..5ea6596 100644 --- a/lib/mpi/mpi.nit +++ b/lib/mpi/mpi.nit @@ -33,7 +33,7 @@ end import c intrude import core::text::flat import serialization -private import json::serialization +private import json in "C Header" `{ #include diff --git a/lib/neo4j/curl_json.nit b/lib/neo4j/curl_json.nit index 03a7ca4..f2a541f 100644 --- a/lib/neo4j/curl_json.nit +++ b/lib/neo4j/curl_json.nit @@ -16,6 +16,7 @@ module curl_json import json::static +import json intrude import curl # An abstract request that defines most of the standard options for Neo4j REST API diff --git a/lib/neo4j/error.nit b/lib/neo4j/error.nit index 9dc24f7..58068ad 100644 --- a/lib/neo4j/error.nit +++ b/lib/neo4j/error.nit @@ -12,6 +12,7 @@ module neo4j::error import json::static +import json # An error thrown by the `neo4j` API. # diff --git a/lib/nitcorn/restful.nit b/lib/nitcorn/restful.nit index 158643a..4342a11 100644 --- a/lib/nitcorn/restful.nit +++ b/lib/nitcorn/restful.nit @@ -16,7 +16,7 @@ module restful is new_annotation(restful) import nitcorn -import json::serialization +import json # Action with `restful` methods class RestfulAction diff --git a/lib/popcorn/pop_handlers.nit b/lib/popcorn/pop_handlers.nit index e4da4a5..8d66cc9 100644 --- a/lib/popcorn/pop_handlers.nit +++ b/lib/popcorn/pop_handlers.nit @@ -18,6 +18,7 @@ module pop_handlers import pop_routes +import json::static import json # Class handler for a route. diff --git a/lib/popcorn/pop_repos.nit b/lib/popcorn/pop_repos.nit index 0a6bd37..7b02c35 100644 --- a/lib/popcorn/pop_repos.nit +++ b/lib/popcorn/pop_repos.nit @@ -120,7 +120,7 @@ module pop_repos import popcorn::pop_config import serialization -import json::serialization +import json import mongodb::queries redef class AppConfig diff --git a/lib/popcorn/pop_validation.nit b/lib/popcorn/pop_validation.nit index 7dd529d..b1464b8 100644 --- a/lib/popcorn/pop_validation.nit +++ b/lib/popcorn/pop_validation.nit @@ -70,7 +70,7 @@ # ~~~ module pop_validation -import json +import json::static # The base class of all validators abstract class DocumentValidator diff --git a/lib/serialization/README.md b/lib/serialization/README.md index 47eef73..3f6ac6c 100644 --- a/lib/serialization/README.md +++ b/lib/serialization/README.md @@ -234,7 +234,7 @@ The main implementations of these services are `JsonSerializer` and `JsonDeseria from the `json_serialization` module. ~~~ -import json_serialization +import json import user_credentials # Data to be serialized and deserialized diff --git a/src/doc/doc_phases/doc_indexing.nit b/src/doc/doc_phases/doc_indexing.nit index 5a2a336..066f8ab 100644 --- a/src/doc/doc_phases/doc_indexing.nit +++ b/src/doc/doc_phases/doc_indexing.nit @@ -18,6 +18,7 @@ module doc_indexing import doc_base import html_templates::html_model # FIXME maybe this phase should depend on `html_render` private import json::static +private import json # Generate the index for then Nitdoc QuickSearch field. # diff --git a/src/doc/html_templates/html_components.nit b/src/doc/html_templates/html_components.nit index 630d28e..a0f1399 100644 --- a/src/doc/html_templates/html_components.nit +++ b/src/doc/html_templates/html_components.nit @@ -18,7 +18,7 @@ module html_components import doc_base import html::bootstrap -import json::static +import json # A label with a text content. class DocHTMLLabel diff --git a/src/examples/nitwebcrawl.nit b/src/examples/nitwebcrawl.nit index 1187476..e981ac6 100644 --- a/src/examples/nitwebcrawl.nit +++ b/src/examples/nitwebcrawl.nit @@ -15,7 +15,7 @@ # Crawler on the nitweb web API module nitwebcrawl -import json +import json::static # Download a HTTP resource fun curl(url: String): String do diff --git a/src/model/model_json.nit b/src/model/model_json.nit index eaa3feb..1d8483c 100644 --- a/src/model/model_json.nit +++ b/src/model/model_json.nit @@ -25,6 +25,7 @@ module model_json import model::model_collect +import json::static import json import loader diff --git a/tests/test_json_deserialization.nit b/tests/test_json_deserialization.nit index 6b936ac..6a4dfdb 100644 --- a/tests/test_json_deserialization.nit +++ b/tests/test_json_deserialization.nit @@ -13,7 +13,7 @@ # limitations under the License. import test_deserialization -import json::serialization +import json #alt1# import test_deserialization_serial #alt3# import test_deserialization_serial diff --git a/tests/test_json_deserialization_heuristic.nit b/tests/test_json_deserialization_heuristic.nit index c79bba3..d0df911 100644 --- a/tests/test_json_deserialization_heuristic.nit +++ b/tests/test_json_deserialization_heuristic.nit @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json::serialization +import json import json::static class MyData diff --git a/tests/test_json_deserialization_plain.nit b/tests/test_json_deserialization_plain.nit index 7358c85..da184d5 100644 --- a/tests/test_json_deserialization_plain.nit +++ b/tests/test_json_deserialization_plain.nit @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json::serialization +import json import json::static class MyClass diff --git a/tests/test_json_unicode.nit b/tests/test_json_unicode.nit index 8800f3e..84850ab 100644 --- a/tests/test_json_unicode.nit +++ b/tests/test_json_unicode.nit @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import json::static import json var str = """{ diff --git a/tests/test_serialization.nit b/tests/test_serialization.nit index b098a82..3530f12 100644 --- a/tests/test_serialization.nit +++ b/tests/test_serialization.nit @@ -17,7 +17,7 @@ #alt2#module test_serialization_alt2 is serialize import serialization -import json::serialization +import json # Simple class class A -- 1.7.9.5