Skip to content

Commit

Permalink
Remove support for all config formats except for YAML and JSON (Azure…
Browse files Browse the repository at this point in the history 
…#1422)

62f3d44 updated serde-hjson to 0.8.2,
which broke the Windows ARM32 build since we patch serde-hjson 0.8.1
for that target.

Furthermore, a39543c then updated config
to 0.9.3 which requires serde-hjson ^0.8.2, so serde-hjson cannot be
downgraded any more.

Since we don't use any format other than YAML for release and JSON for tests,
this change only enables the features for those formats. This drops the
serde-hjson dependency entirely.

Also, this change removes the patch for the cmake crate.
9001b8e bumped cmake to 0.1.40
so the existing patch for 0.1.30 was not being applied. However the build
succeeds with 0.1.40 anyway, so it looks like the patch isn't necessary
anyway.
  • Loading branch information
@arsing
arsing authored Jul 9, 2019
1 parent 3c2e0b4 commit f9e30c1
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 165 deletions.
67 changes: 0 additions & 67 deletions THIRDPARTYNOTICES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3052,34 +3052,6 @@ THE SOFTWARE.

***

hjson/hjson-rust
The MIT License (MIT)
Copyright (c) 2014 The Rust Project Developers
Copyright (c) 2016 Christian Zangl
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

***

Gilnaa/memoffset
Copyright (c) 2017 Gilad Naaman
Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down Expand Up @@ -3121,19 +3093,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

***

zonyitoo/rust-ini
The MIT License (MIT)

Copyright (c) 2014 Y. T. CHUNG

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

***

fizyk20/generic-array
The MIT License (MIT)
Copyright (c) 2015 Bartlomiej Kaminski
Expand Down Expand Up @@ -3946,32 +3905,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

***

toml-rs
Copyright (c) 2014 Alex Crichton
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

***

pkg-config-rs
Copyright (c) 2014 Alex Crichton
Permission is hereby granted, free of charge, to any
Expand Down
93 changes: 0 additions & 93 deletions edgelet/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions edgelet/build/windows/util.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,10 @@ function PatchRustForArm {
[patch.crates-io]
backtrace = { git = "https://github.com/philipktlin/backtrace-rs", branch = "arm" }
cmake = { git = "https://github.com/philipktlin/cmake-rs", branch = "arm" }
dtoa = { git = "https://github.com/philipktlin/dtoa", branch = "arm" }
iovec = { git = "https://github.com/philipktlin/iovec", branch = "arm" }
mio = { git = "https://github.com/philipktlin/mio", branch = "arm" }
miow = { git = "https://github.com/philipktlin/miow", branch = "arm" }
serde-hjson = { git = "https://github.com/philipktlin/hjson-rust", branch = "arm" }
winapi = { git = "https://github.com/philipktlin/winapi-rs", branch = "arm/v0.3.5" }
[patch."https://github.com/Azure/mio-uds-windows.git"]
Expand Down
3 changes: 2 additions & 1 deletion edgelet/edgelet-docker/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
base64 = "0.9"
chrono = { version = "0.4", features = ["serde"] }
config = "0.9"
config = { version = "0.9", default-features = false, features = ["yaml"] }
failure = "0.1"
futures = "0.1"
hyper = "0.12"
Expand All @@ -28,6 +28,7 @@ edgelet-utils = { path = "../edgelet-utils" }
provisioning = { path = "../provisioning" }

[dev_dependencies]
config = { version = "0.9", default-features = false, features = ["json", "yaml"] }
json-patch = "0.2.5"
maplit = "1.0"
time = "0.1"
Expand Down
3 changes: 2 additions & 1 deletion edgelet/edgelet-kube/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
base64 = "0.9"
config = "0.9"
config = { version = "0.9", default-features = false, features = ["yaml"] }
failure = "0.1"
futures = "0.1"
hyper = "0.12"
Expand All @@ -29,6 +29,7 @@ kube-client = { path = "../kube-client" }
provisioning = { path = "../provisioning" }

[dev_dependencies]
config = { version = "0.9", default-features = false, features = ["json", "yaml"] }
json-patch = "0.2.5"
maplit = "1.0"
time = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/edgelet-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false
edition = "2018"

[dependencies]
config = "0.9"
config = { version = "0.9", default-features = false }
failure = "0.1.2"
log = "0.4"
serde = "1.0"
Expand Down

0 comments on commit f9e30c1

Please sign in to comment.