Merge remote-tracking branch 'serde/master' into map_seq_ser

.cargo/config

@@ -0,0 +1,7 @@
+paths = [
+  "serde",
+  "serde_codegen",
+  "serde_codegen_internals",
+  "serde_macros",
+  "serde_test",
+]

CONTRIBUTING.md

@@ -0,0 +1,45 @@
+# Contributing to Serde
+
+Serde welcomes contribution from everyone. Here are the guidelines if you are
+thinking of helping us:
+
+## Contributions
+
+Contributions to Serde or its dependencies should be made in the form of GitHub
+pull requests. Each pull request will be reviewed by a core contributor
+(someone with permission to land patches) and either landed in the main tree or
+given feedback for changes that would be required. All contributions should
+follow this format, even those from core contributors.
+
+Should you wish to work on an issue, please claim it first by commenting on
+the GitHub issue that you want to work on it. This is to prevent duplicated
+efforts from contributors on the same issue.
+
+## Pull Request Checklist
+
+- Branch from the master branch and, if needed, rebase to the current master
+  branch before submitting your pull request. If it doesn't merge cleanly with
+  master you may be asked to rebase your changes.
+
+- Commits should be as small as possible, while ensuring that each commit is
+  correct independently (i.e., each commit should compile and pass tests). 
+
+- If your patch is not getting reviewed or you need a specific person to review
+  it, you can @-reply a reviewer asking for a review in the pull request or a
+  comment, or you can ask for a review in `#serde` on `irc.mozilla.org`.
+
+- Add tests relevant to the fixed bug or new feature.
+
+## Conduct
+
+In all Serde-related forums, we follow the [Rust Code of
+Conduct](https://www.rust-lang.org/conduct.html).  For escalation or moderation
+issues, please contact Erick (erick.tryzelaar@gmail.com) instead of the Rust
+moderation team.
+
+## Communication
+
+Beyond opening tickets on the
+[serde-rs/serde](https://github.com/serde-rs/serde) project, Serde contributors
+frequent the `#serde` channel on
+[`irc.mozilla.org`](https://wiki.mozilla.org/IRC).

examples/.cargo/config

@@ -1,5 +0,0 @@
-paths = [
-    "../serde",
-    "../serde_codegen",
-    "../serde_macros",
-]

serde_codegen/Cargo.toml

@@ -32,6 +32,6 @@ aster = { version = "^0.21.1", default-features = false }
 clippy = { version = "^0.*", optional = true }
 quasi = { version = "^0.15.0", default-features = false }
 quasi_macros = { version = "^0.15.0", optional = true }
-serde_codegen_internals = { version = "^0.3.0", path = "../serde_codegen_internals", default-features = false }
+serde_codegen_internals = { version = "^0.3.0", default-features = false }
 syntex = { version = "^0.38.0", optional = true }
 syntex_syntax = { version = "^0.38.0", optional = true }

serde_macros/Cargo.toml

@@ -18,15 +18,15 @@ nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-tes
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }
-serde_codegen = { version = "^0.7.14", path = "../serde_codegen", default-features = false, features = ["nightly"] }
+serde_codegen = { version = "^0.7.14", default-features = false, features = ["nightly"] }
 
 [dev-dependencies]
 clippy = "^0.0.78"
 compiletest_rs = "^0.2.0"
 fnv = "1.0"
 rustc-serialize = "^0.3.16"
-serde = { version = "^0.7.14", path = "../serde" }
-serde_test = { version = "^0.7.14", path = "../serde_test" }
+serde = "0.7.14"
+serde_test = "0.7.14"
 
 [[test]]
 name = "test"

serde_test/Cargo.toml

@@ -11,4 +11,4 @@ keywords = ["serde", "serialization"]
 include = ["Cargo.toml", "src/**/*.rs"]
 
 [dependencies]
-serde = { version = "0.7.14", path = "../serde" }
+serde = "0.7.14"

testing/Cargo.toml

@@ -14,13 +14,13 @@ build = "build.rs"
 nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
 
 [build-dependencies]
-serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
+serde_codegen = { version = "*", features = ["with-syntex"] }
 
 [dev-dependencies]
 fnv = "1.0"
 rustc-serialize = "^0.3.16"
-serde = { version = "*", path = "../serde" }
-serde_test = { version = "*", path = "../serde_test" }
+serde = "*"
+serde_test = "*"
 
 [dependencies]
 clippy = { version = "^0.*", optional = true }