Skip to content

Switch to 2018 edition, upgrade deps #1

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.

Sign up for GitHub

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

Open
slonopotamus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to 2018 edition, upgrade deps #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,26 @@ readme = "README.md"
keywords = ["vs2017", "detection", "query"]
categories = ["development-tools::build-utils"]
license = "Apache-2.0 OR MIT"
edition = "2018"

[target.'cfg(target_os = "windows")'.dependencies.chrono]
version = "0.4"
features = ["serde"]

[target.'cfg(target_os = "windows")'.dependencies.semver]
version = "0.9"
version = "0.10"
features = ["serde"]

[target.'cfg(target_os = "windows")'.dependencies.serde]
version = "1"

[target.'cfg(target_os = "windows")'.dependencies.serde_derive]
version = "1"
features = ["derive"]

[target.'cfg(target_os = "windows")'.dependencies.serde_json]
version = "1"

[target.'cfg(target_os = "windows")'.dependencies.url]
version = "1"

[target.'cfg(target_os = "windows")'.dependencies.url_serde]
version = "0.2"
version = "2"
features = ["serde"]

[target.'cfg(target_os = "windows")'.dependencies.winapi]
version = "0.3"
Expand Down
38 changes: 1 addition & 37 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,6 @@
//! Provides support for invoking and capturing the output of the vswhere utility.

#![cfg(target_os = "windows")]
#![forbid(warnings)]
#![forbid(future_incompatible)]
#![deny(unused)]
#![forbid(box_pointers)]
#![forbid(missing_copy_implementations)]
#![forbid(missing_debug_implementations)]
#![forbid(missing_docs)]
#![forbid(trivial_casts)]
#![forbid(trivial_numeric_casts)]
#![forbid(unused_import_braces)]
#![deny(unused_qualifications)]
#![forbid(unused_results)]
#![forbid(variant_size_differences)]
#![cfg_attr(feature = "cargo-clippy", forbid(clippy))]
#![cfg_attr(feature = "cargo-clippy", deny(clippy_pedantic))]
#![cfg_attr(feature = "cargo-clippy", forbid(clippy_cargo))]
#![cfg_attr(feature = "cargo-clippy", forbid(clippy_complexity))]
#![cfg_attr(feature = "cargo-clippy", deny(clippy_correctness))]
#![cfg_attr(feature = "cargo-clippy", deny(clippy_perf))]
#![cfg_attr(feature = "cargo-clippy", forbid(clippy_style))]

extern crate chrono;
extern crate semver;
extern crate serde;
#[macro_use]
extern crate serde_derive;
extern crate serde_json;
extern crate url;
extern crate url_serde;
extern crate winapi;

use chrono::offset::Utc;
use chrono::DateTime;
Expand Down Expand Up @@ -78,7 +48,6 @@ pub struct Config {
latest: bool,
}

#[cfg_attr(feature = "cargo-clippy", allow(similar_names))]
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
/// Information about a Visual Studio installation.
Expand All @@ -95,19 +64,15 @@ pub struct InstallInfo {
description: String,
channel_id: String,
channel_path: PathBuf,
#[serde(with = "url_serde")]
channel_uri: Url,
engine_path: PathBuf,
#[serde(with = "url_serde")]
release_notes: Url,
#[serde(with = "url_serde")]
third_party_notices: Url,
update_date: DateTime<Utc>,
catalog: InstallCatalog,
properties: InstallProperties,
}

#[cfg_attr(feature = "cargo-clippy", allow(similar_names))]
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
/// Catalog information for a Visual Studio installation.
Expand Down Expand Up @@ -171,7 +136,6 @@ fn deserialize_uppercase_bool<'de, D: Deserializer<'de>>(
deserializer.deserialize_str(UppercaseBoolVisitor)
}

#[cfg_attr(feature = "cargo-clippy", allow(trivially_copy_pass_by_ref))]
fn serialize_uppercase_bool<S: Serializer>(
boolean: &bool,
serializer: S,
Expand Down Expand Up @@ -669,7 +633,7 @@ impl InstallProperties {

#[cfg(test)]
mod tests {
use {Config, FourPointVersion};
use crate::{Config, FourPointVersion};

#[test]
fn test_default() {
Expand Down