Release 1.0.107

Fix indexing bug when `skip` and `other` are combined

.github/workflows/ci.yml

@@ -0,0 +1,155 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  schedule: [cron: "40 1 * * *"]
+
+jobs:
+  test:
+    name: Test suite
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cd test_suite && cargo test --features unstable
+
+  windows:
+    name: Test suite (windows)
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cd test_suite && cargo test --features unstable -- --skip ui --exact
+
+  stable:
+    name: Rust stable
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cd serde && cargo build --features rc
+      - run: cd serde && cargo build --no-default-features
+      - run: cd serde_test && cargo build
+      - run: cd serde_test && cargo test --features serde/derive,serde/rc
+
+  beta:
+    name: Rust beta
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@beta
+      - run: cd serde && cargo build --features rc
+      - run: cd test_suite && cargo test
+
+  nightly:
+    name: Rust nightly ${{matrix.os == 'windows' && '(windows)' || ''}}
+    runs-on: ${{matrix.os}}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, windows]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cd serde && cargo build
+      - run: cd serde && cargo build --no-default-features
+      - run: cd serde && cargo build --no-default-features --features alloc
+      - run: cd serde && cargo build --no-default-features --features rc,alloc
+      - run: cd serde && cargo test --features derive,rc,unstable
+      - run: cd test_suite/no_std && cargo build
+        if: matrix.os != 'windows'
+
+  msrv:
+    name: Rust 1.13.0
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@1.13.0
+      - name: Get timestamp for cache
+        id: date
+        run: echo ::set-output name=yearmo::$(date +%Y%m)
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry/index
+          key: cargo-registry-index-${{steps.date.outputs.yearmo}}
+      - run: cd serde && cargo build --features rc
+      - run: cd serde && cargo build --no-default-features
+      - run: cd serde_test && cargo build
+
+  build:
+    name: Rust ${{matrix.rust}}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rust: [1.19.0, 1.20.0, 1.21.0, 1.25.0, 1.26.0, 1.34.0]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{matrix.rust}}
+      - run: cd serde && cargo build --no-default-features
+      - run: cd serde && cargo build
+
+  more:
+    name: Rust ${{matrix.rust}}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rust: [1.27.0, 1.28.0]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{matrix.rust}}
+        # Work around failing to parse manifest because editions are unstable.
+      - run: sed -i /test_suite/d Cargo.toml
+      - run: cd serde && cargo build --no-default-features
+      - run: cd serde && cargo build
+
+  alloc:
+    name: Rust 1.36.0
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@1.36.0
+      - run: cd serde && cargo build --no-default-features --features alloc
+
+  emscripten:
+    name: Emscripten
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@nightly
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 9
+      - name: Install cargo-web
+        run: |
+          CARGO_WEB_RELEASE=$(curl -L -s -H Accept:application/json https://github.com/koute/cargo-web/releases/latest)
+          CARGO_WEB_VERSION=$(echo "${CARGO_WEB_RELEASE}" | jq -r .tag_name)
+          CARGO_WEB_URL="https://github.com/koute/cargo-web/releases/download/${CARGO_WEB_VERSION}/cargo-web-x86_64-unknown-linux-gnu.gz"
+          mkdir -p ~/.cargo/bin
+          curl -L "${CARGO_WEB_URL}" | gzip -d > ~/.cargo/bin/cargo-web
+          chmod +x ~/.cargo/bin/cargo-web
+      - run: cd test_suite && cargo web test --target=asmjs-unknown-emscripten --nodejs
+        continue-on-error: true
+      - run: cd test_suite && cargo web test --target=wasm32-unknown-emscripten --nodejs
+        continue-on-error: true
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@clippy
+        # The need for -Aredundant_field_names here is a Clippy bug.
+        # https://github.com/rust-lang/rust-clippy/issues/5356
+      - run: cd serde && cargo clippy --features rc,unstable -- -D clippy::all -A clippy::redundant_field_names
+      - run: cd serde_derive && cargo clippy -- -D clippy::all
+      - run: cd serde_test && cargo clippy -- -D clippy::all -A clippy::redundant_field_names
+      - run: cd test_suite && cargo clippy --tests --features unstable -- -D clippy::all -A clippy::redundant_field_names
+      - run: cd test_suite/no_std && cargo clippy -- -D clippy::all -A clippy::redundant_field_names

.travis.yml

@@ -1,107 +0,0 @@
-language: rust
-
-matrix:
-  include:
-    - rust: stable
-      script:
-        - cd "${TRAVIS_BUILD_DIR}/serde"
-        - cargo build --features rc
-        - cargo build --no-default-features
-        - cd "${TRAVIS_BUILD_DIR}/serde_test"
-        - cargo build
-        - cargo test --features serde/derive,serde/rc
-
-    - rust: beta
-      script:
-        - cd "${TRAVIS_BUILD_DIR}/serde"
-        - cargo build --features rc
-        - cd "${TRAVIS_BUILD_DIR}/test_suite"
-        - cargo test
-
-    - rust: nightly
-      script:
-        - cd "${TRAVIS_BUILD_DIR}/serde"
-        - cargo build
-        - cargo build --no-default-features
-        - cargo build --no-default-features --features alloc
-        - cargo build --no-default-features --features rc,alloc
-        - cargo test --features derive,rc,unstable
-        - cd "${TRAVIS_BUILD_DIR}/test_suite"
-        - cargo test --features unstable
-        - cd "${TRAVIS_BUILD_DIR}/test_suite/no_std"
-        - cargo build
-
-    - rust: 1.13.0
-      script:
-        - cd "${TRAVIS_BUILD_DIR}/serde"
-        - cargo build --features rc
-        - cargo build --no-default-features
-        - cd "${TRAVIS_BUILD_DIR}/serde_test"
-        - cargo build
-
-    - rust: 1.19.0
-    - rust: 1.20.0
-    - rust: 1.21.0
-    - rust: 1.25.0
-    - rust: 1.26.0
-
-    # Work around failing to parse manifest because editions are unstable.
-    - rust: 1.27.0
-      before_script: sed -i /test_suite/d Cargo.toml
-    - rust: 1.28.0
-      before_script: sed -i /test_suite/d Cargo.toml
-
-    - rust: 1.31.0
-      script:
-        - cd "${TRAVIS_BUILD_DIR}/serde_derive"
-        - cargo build
-
-    - rust: 1.34.0
-
-    - rust: 1.36.0
-      script:
-        - cd "${TRAVIS_BUILD_DIR}/serde"
-        - cargo build --no-default-features --features alloc
-
-    - rust: nightly
-      name: Clippy
-      script:
-        - rustup component add clippy || travis_terminate 0
-        - cargo clippy -- -D clippy::all
-        - cd "${TRAVIS_BUILD_DIR}/serde"
-        - cargo clippy --features rc,unstable -- -D clippy::all
-        - cd "${TRAVIS_BUILD_DIR}/serde_derive"
-        - cargo clippy -- -D clippy::all
-        - cd "${TRAVIS_BUILD_DIR}/serde_test"
-        - cargo clippy -- -D clippy::all
-        - cd "${TRAVIS_BUILD_DIR}/test_suite"
-        - cargo clippy --tests --features unstable -- -D clippy::all
-        - cd "${TRAVIS_BUILD_DIR}/test_suite/no_std"
-        - cargo clippy -- -D clippy::all
-
-    - rust: nightly
-      name: Emscripten
-      script:
-        - CARGO_WEB_RELEASE=$(curl -L -s -H Accept:application/json https://github.com/koute/cargo-web/releases/latest)
-        - CARGO_WEB_VERSION=$(echo "${CARGO_WEB_RELEASE}" | jq -r .tag_name)
-        - CARGO_WEB_URL="https://github.com/koute/cargo-web/releases/download/${CARGO_WEB_VERSION}/cargo-web-x86_64-unknown-linux-gnu.gz"
-
-        - nvm install 9
-        - mkdir -p ~/.cargo/bin
-        - curl -L "${CARGO_WEB_URL}" | gzip -d > ~/.cargo/bin/cargo-web
-        - chmod +x ~/.cargo/bin/cargo-web
-
-        - cd "${TRAVIS_BUILD_DIR}/test_suite"
-        - cargo web test --target=asmjs-unknown-emscripten --nodejs
-        - cargo web test --target=wasm32-unknown-emscripten --nodejs
-
-  allow_failures:
-    - rust: nightly
-      name: Clippy
-    - rust: nightly
-      name: Emscripten
-
-script:
-  - cd "${TRAVIS_BUILD_DIR}/serde"
-  - cargo build --no-default-features
-  - cargo build

README.md

@@ -1,7 +1,7 @@
-# Serde   [![Build Status]][travis] [![Latest Version]][crates.io] [![serde: rustc 1.13+]][Rust 1.13] [![serde_derive: rustc 1.31+]][Rust 1.31]
+# Serde   [![Build Status]][actions] [![Latest Version]][crates.io] [![serde: rustc 1.13+]][Rust 1.13] [![serde_derive: rustc 1.31+]][Rust 1.31]
 
-[Build Status]: https://api.travis-ci.org/serde-rs/serde.svg?branch=master
+[Build Status]: https://img.shields.io/github/workflow/status/serde-rs/serde/CI/master
-[travis]: https://travis-ci.org/serde-rs/serde
+[actions]: https://github.com/serde-rs/serde/actions?query=branch%3Amaster
 [Latest Version]: https://img.shields.io/crates/v/serde.svg
 [crates.io]: https://crates.io/crates/serde
 [serde: rustc 1.13+]: https://img.shields.io/badge/serde-rustc_1.13+-lightgray.svg

appveyor.yml

@@ -1,39 +0,0 @@
-environment:
-  matrix:
-    - APPVEYOR_RUST_CHANNEL: stable
-    - APPVEYOR_RUST_CHANNEL: nightly
-
-install:
-  # Install rust, x86_64-pc-windows-msvc host
-  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain %APPVEYOR_RUST_CHANNEL%
-  - set PATH=C:\msys64\usr\bin;%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -vV
-  - cargo -vV
-
-build: false
-
-for:
-  - matrix:
-      only:
-        - APPVEYOR_RUST_CHANNEL: stable
-    test_script:
-      - cd %APPVEYOR_BUILD_FOLDER%\serde
-      - cargo build --features rc
-      - cargo build --no-default-features
-      - cd %APPVEYOR_BUILD_FOLDER%\serde_test
-      - cargo build
-      - cargo test --features serde/derive,serde/rc
-
-  - matrix:
-      only:
-        - APPVEYOR_RUST_CHANNEL: nightly
-    test_script:
-      - cd %APPVEYOR_BUILD_FOLDER%\serde
-      - cargo build
-      - cargo build --no-default-features
-      - cargo build --no-default-features --features alloc
-      - cargo build --no-default-features --features rc,alloc
-      - cargo test --features derive,rc,unstable
-      - cd %APPVEYOR_BUILD_FOLDER%\test_suite
-      - cargo test --features unstable

serde/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde"
-version = "1.0.106" # remember to update html_root_url and serde_derive dependency
+version = "1.0.107" # remember to update html_root_url and serde_derive dependency
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "A generic serialization/deserialization framework"
@@ -13,12 +13,8 @@ readme = "crates-io.md"
 include = ["Cargo.toml", "build.rs", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 build = "build.rs"
 
-[badges]
-travis-ci = { repository = "serde-rs/serde" }
-appveyor = { repository = "serde-rs/serde" }
-
 [dependencies]
-serde_derive = { version = "=1.0.106", optional = true, path = "../serde_derive" }
+serde_derive = { version = "=1.0.107", optional = true, path = "../serde_derive" }
 
 [dev-dependencies]
 serde_derive = { version = "1.0", path = "../serde_derive" }

serde/src/de/impls.rs

@@ -90,10 +90,13 @@ macro_rules! visit_integer_method {
         {
             match FromPrimitive::$from_method(v) {
                 Some(v) => Ok(v),
-                None => Err(Error::invalid_value(Unexpected::$group(v as $group_ty), &self)),
+                None => Err(Error::invalid_value(
+                    Unexpected::$group(v as $group_ty),
+                    &self,
+                )),
             }
         }
-    }
+    };
 }
 
 macro_rules! visit_float_method {
@@ -105,7 +108,7 @@ macro_rules! visit_float_method {
         {
             Ok(v as Self::Value)
         }
-    }
+    };
 }
 
 macro_rules! impl_deserialize_num {

serde/src/lib.rs

@@ -75,7 +75,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.106")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.107")]
 // Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
 // Unstable functionality only if the user asks for it. For tracking and

serde/src/private/de.rs

@@ -183,7 +183,9 @@ where
         }
     }
 
-    deserializer.deserialize_bytes(CowBytesVisitor).map(From::from)
+    deserializer
+        .deserialize_bytes(CowBytesVisitor)
+        .map(From::from)
 }
 
 pub mod size_hint {
@@ -2472,7 +2474,7 @@ mod content {
         where
             M: MapAccess<'de>,
         {
-            while let Some(_) = try!(access.next_entry::<IgnoredAny, IgnoredAny>()) {}
+            while try!(access.next_entry::<IgnoredAny, IgnoredAny>()).is_some() {}
             Ok(())
         }
     }

serde_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_derive"
-version = "1.0.106" # remember to update html_root_url
+version = "1.0.107" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
@@ -11,10 +11,6 @@ keywords = ["serde", "serialization", "no_std"]
 readme = "crates-io.md"
 include = ["Cargo.toml", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 
-[badges]
-travis-ci = { repository = "serde-rs/serde" }
-appveyor = { repository = "serde-rs/serde" }
-
 [features]
 default = []
 deserialize_in_place = []

serde_derive/src/bound.rs

@@ -156,7 +156,7 @@ pub fn with_bound(
         .collect();
 
     let mut visitor = FindTyParams {
-        all_type_params: all_type_params,
+        all_type_params,
         relevant_type_params: HashSet::new(),
         associated_type_usage: Vec::new(),
     };
@@ -271,7 +271,7 @@ pub fn with_lifetime_bound(generics: &syn::Generics, lifetime: &str) -> syn::Gen
         .collect();
 
     syn::Generics {
-        params: params,
+        params,
         ..generics.clone()
     }
 }

serde_derive/src/de.rs

@@ -134,11 +134,11 @@ impl Parameters {
         let has_getter = cont.data.has_getter();
 
         Parameters {
-            local: local,
+            local,
-            this: this,
+            this,
-            generics: generics,
+            generics,
-            borrowed: borrowed,
+            borrowed,
-            has_getter: has_getter,
+            has_getter,
         }
     }
 
@@ -1153,10 +1153,13 @@ fn prepare_enum_variant_enum(
     variants: &[Variant],
     cattrs: &attr::Container,
 ) -> (TokenStream, Stmts) {
-    let variant_names_idents: Vec<_> = variants
+    let mut deserialized_variants = variants
         .iter()
         .enumerate()
-        .filter(|&(_, variant)| !variant.attrs.skip_deserializing())
+        .filter(|&(_, variant)| !variant.attrs.skip_deserializing());
+
+    let variant_names_idents: Vec<_> = deserialized_variants
+        .clone()
         .map(|(i, variant)| {
             (
                 variant.attrs.name().deserialize_name(),
@@ -1166,7 +1169,7 @@ fn prepare_enum_variant_enum(
         })
         .collect();
 
-    let other_idx = variants.iter().position(|variant| variant.attrs.other());
+    let other_idx = deserialized_variants.position(|(_, variant)| variant.attrs.other());
 
     let variants_stmt = {
         let variant_names = variant_names_idents.iter().map(|(name, _, _)| name);

serde_derive/src/dummy.rs

@@ -21,9 +21,7 @@ pub fn wrap_in_const(
             use #path as _serde;
         },
         None => quote! {
-            #[allow(unknown_lints)]
+            #[allow(rust_2018_idioms, clippy::useless_attribute)]
-            #[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
-            #[allow(rust_2018_idioms)]
             extern crate serde as _serde;
         },
     };

serde_derive/src/internals/ast.rs

@@ -110,8 +110,8 @@ impl<'a> Container<'a> {
 
         let mut item = Container {
             ident: item.ident.clone(),
-            attrs: attrs,
+            attrs,
-            data: data,
+            data,
             generics: &item.generics,
             original: item,
         };
@@ -148,9 +148,9 @@ fn enum_from_ast<'a>(
                 struct_from_ast(cx, &variant.fields, Some(&attrs), container_default);
             Variant {
                 ident: variant.ident.clone(),
-                attrs: attrs,
+                attrs,
-                style: style,
+                style,
-                fields: fields,
+                fields,
                 original: variant,
             }
         })

serde_derive/src/internals/attr.rs

@@ -32,8 +32,8 @@ struct Attr<'c, T> {
 impl<'c, T> Attr<'c, T> {
     fn none(cx: &'c Ctxt, name: Symbol) -> Self {
         Attr {
-            cx: cx,
+            cx,
-            name: name,
+            name,
             tokens: TokenStream::new(),
             value: None,
         }
@@ -101,8 +101,8 @@ struct VecAttr<'c, T> {
 impl<'c, T> VecAttr<'c, T> {
     fn none(cx: &'c Ctxt, name: Symbol) -> Self {
         VecAttr {
-            cx: cx,
+            cx,
-            name: name,
+            name,
             first_dup_tokens: TokenStream::new(),
             values: Vec::new(),
         }
@@ -176,7 +176,7 @@ impl Name {
             serialize_renamed: ser_renamed,
             deserialize: de_name.unwrap_or(source_name),
             deserialize_renamed: de_renamed,
-            deserialize_aliases: deserialize_aliases,
+            deserialize_aliases,
         }
     }
 
@@ -716,7 +716,7 @@ fn decide_tag(
                     }
                 }
             }
-            TagType::Internal { tag: tag }
+            TagType::Internal { tag }
         }
         (Some((untagged_tokens, _)), Some((tag_tokens, _)), None) => {
             cx.error_spanned_by(
@@ -747,10 +747,7 @@ fn decide_tag(
             );
             TagType::External
         }
-        (None, Some((_, tag)), Some((_, content))) => TagType::Adjacent {
+        (None, Some((_, tag)), Some((_, content))) => TagType::Adjacent { tag, content },
-            tag: tag,
-            content: content,
-        },
         (Some((untagged_tokens, _)), Some((tag_tokens, _)), Some((content_tokens, _))) => {
             cx.error_spanned_by(
                 untagged_tokens,
@@ -1383,7 +1380,7 @@ impl Field {
                 let expr = syn::ExprPath {
                     attrs: Vec::new(),
                     qself: None,
-                    path: path,
+                    path,
                 };
                 deserialize_with.set_if_none(expr);
             } else if is_cow(&field.ty, is_slice_u8) {
@@ -1400,7 +1397,7 @@ impl Field {
                 let expr = syn::ExprPath {
                     attrs: Vec::new(),
                     qself: None,
-                    path: path,
+                    path,
                 };
                 deserialize_with.set_if_none(expr);
             }
@@ -1420,7 +1417,7 @@ impl Field {
             deserialize_with: deserialize_with.get(),
             ser_bound: ser_bound.get(),
             de_bound: de_bound.get(),
-            borrowed_lifetimes: borrowed_lifetimes,
+            borrowed_lifetimes,
             getter: getter.get(),
             flatten: flatten.get(),
             transparent: false,

serde_derive/src/lib.rs

@@ -13,46 +13,38 @@
 //!
 //! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.106")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.107")]
 #![allow(unknown_lints, bare_trait_objects)]
-#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
+#![deny(clippy::all, clippy::pedantic)]
-#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints
-#![cfg_attr(
+#![allow(
-    feature = "cargo-clippy",
+    clippy::cognitive_complexity,
-    allow(
+    clippy::enum_variant_names,
-        cognitive_complexity,
+    clippy::needless_pass_by_value,
-        enum_variant_names,
+    clippy::too_many_arguments,
-        needless_pass_by_value,
+    clippy::trivially_copy_pass_by_ref,
-        redundant_field_names,
+    clippy::used_underscore_binding,
-        too_many_arguments,
+    clippy::wildcard_in_or_patterns
-        trivially_copy_pass_by_ref,
-        used_underscore_binding,
-        wildcard_in_or_patterns,
-    )
 )]
 // Ignored clippy_pedantic lints
-#![cfg_attr(
+#![allow(
-    feature = "cargo-clippy",
+    clippy::cast_possible_truncation,
-    allow(
+    clippy::checked_conversions,
-        cast_possible_truncation,
+    clippy::doc_markdown,
-        checked_conversions,
+    clippy::enum_glob_use,
-        doc_markdown,
+    clippy::filter_map,
-        enum_glob_use,
+    clippy::indexing_slicing,
-        filter_map,
+    clippy::items_after_statements,
-        indexing_slicing,
+    clippy::match_same_arms,
-        items_after_statements,
+    clippy::module_name_repetitions,
-        match_same_arms,
+    clippy::must_use_candidate,
-        module_name_repetitions,
+    clippy::similar_names,
-        must_use_candidate,
+    clippy::single_match_else,
-        similar_names,
+    clippy::struct_excessive_bools,
-        single_match_else,
+    clippy::too_many_lines,
-        struct_excessive_bools,
+    clippy::unseparated_literal_suffix,
-        too_many_lines,
+    clippy::use_self,
-        unseparated_literal_suffix,
+    clippy::wildcard_imports
-        use_self,
-        wildcard_imports,
-    )
 )]
 // The `quote!` macro requires deep recursion.
 #![recursion_limit = "512"]

serde_derive/src/ser.rs

@@ -106,10 +106,10 @@ impl Parameters {
         let generics = build_generics(cont);
 
         Parameters {
-            self_var: self_var,
+            self_var,
-            this: this,
+            this,
-            generics: generics,
+            generics,
-            is_remote: is_remote,
+            is_remote,
         }
     }
 
@@ -538,17 +538,17 @@ fn serialize_externally_tagged_variant(
         }
         Style::Tuple => serialize_tuple_variant(
             TupleVariant::ExternallyTagged {
-                type_name: type_name,
+                type_name,
-                variant_index: variant_index,
+                variant_index,
-                variant_name: variant_name,
+                variant_name,
             },
             params,
             &variant.fields,
         ),
         Style::Struct => serialize_struct_variant(
             StructVariant::ExternallyTagged {
-                variant_index: variant_index,
+                variant_index,
-                variant_name: variant_name,
+                variant_name,
             },
             params,
             &variant.fields,
@@ -614,10 +614,7 @@ fn serialize_internally_tagged_variant(
             }
         }
         Style::Struct => serialize_struct_variant(
-            StructVariant::InternallyTagged {
+            StructVariant::InternallyTagged { tag, variant_name },
-                tag: tag,
-                variant_name: variant_name,
-            },
             params,
             &variant.fields,
             &type_name,

serde_derive_internals/Cargo.toml

@@ -18,9 +18,5 @@ proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0", default-features = false, features = ["derive", "parsing", "printing", "clone-impls"] }
 
-[badges]
-travis-ci = { repository = "serde-rs/serde" }
-appveyor = { repository = "serde-rs/serde" }
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

serde_test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_test"
-version = "1.0.106" # remember to update html_root_url
+version = "1.0.107" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Token De/Serializer for testing De/Serialize implementations"
@@ -18,9 +18,5 @@ serde = { version = "1.0.60", path = "../serde" }
 serde = { version = "1.0", path = "../serde" }
 serde_derive = { version = "1.0", path = "../serde_derive" }
 
-[badges]
-travis-ci = { repository = "serde-rs/serde" }
-appveyor = { repository = "serde-rs/serde" }
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

serde_test/src/lib.rs

@@ -144,7 +144,7 @@
 //! # }
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/serde_test/1.0.106")]
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.107")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints

test_suite/Cargo.toml

@@ -7,16 +7,20 @@ publish = false
 build = "build.rs"
 
 [features]
+expandtest = []
 unstable = ["serde/unstable"]
 
 [dependencies]
 serde = { path = "../serde" }
 
+[build-dependencies]
+toolchain_find = "0.1"
+
 [dev-dependencies]
 fnv = "1.0"
-rustversion = "0.1"
+macrotest = "=1.0.0"
+rustversion = "1.0"
 serde = { path = "../serde", features = ["rc", "derive"] }
 serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] }
 serde_test = { path = "../serde_test" }
 trybuild = "1.0"
-macrotest = "0.1"

test_suite/build.rs

@@ -1,13 +1,13 @@
 use std::process::{Command, ExitStatus, Stdio};
 
-#[cfg(not(windows))]
+fn has_cargo_expand() -> bool {
-const CARGO_EXPAND: &str = "cargo-expand";
+    let cargo_expand = if cfg!(windows) {
+        "cargo-expand.exe"
+    } else {
+        "cargo-expand"
+    };
 
-#[cfg(windows)]
+    Command::new(cargo_expand)
-const CARGO_EXPAND: &str = "cargo-expand.exe";
-
-fn main() {
-    if Command::new(CARGO_EXPAND)
         .arg("--version")
         .stdin(Stdio::null())
         .stdout(Stdio::null())
@@ -16,7 +16,14 @@ fn main() {
         .as_ref()
         .map(ExitStatus::success)
         .unwrap_or(false)
-    {
+}
-        println!("cargo:rustc-cfg=cargo_expand");
+
+fn has_rustfmt() -> bool {
+    toolchain_find::find_installed_component("rustfmt").is_some()
+}
+
+fn main() {
+    if cfg!(feature = "expandtest") && has_cargo_expand() && has_rustfmt() {
+        println!("cargo:rustc-cfg=expandtest");
     }
 }

test_suite/tests/expand/de_enum.expanded.rs

@@ -7,10 +7,10 @@ enum DeEnum<B, C, D> {
     _Seq2(i8, B, C, D),
     _Map2 { a: i8, b: B, c: C, d: D },
 }
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_DeEnum: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<B, C, D> _serde::Serialize for DeEnum<B, C, D>
@@ -259,10 +259,10 @@ const _IMPL_SERIALIZE_FOR_DeEnum: () = {
         }
     }
 };
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_DeEnum: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, B, C, D> _serde::Deserialize<'de> for DeEnum<B, C, D>

test_suite/tests/expand/default_ty_param.expanded.rs

@@ -8,10 +8,10 @@ impl AssociatedType for i32 {
 struct DefaultTyParam<T: AssociatedType<X = i32> = i32> {
     phantom: PhantomData<T>,
 }
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_DefaultTyParam: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<T: AssociatedType<X = i32>> _serde::Serialize for DefaultTyParam<T> {
@@ -43,10 +43,10 @@ const _IMPL_SERIALIZE_FOR_DefaultTyParam: () = {
         }
     }
 };
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_DefaultTyParam: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, T: AssociatedType<X = i32>> _serde::Deserialize<'de> for DefaultTyParam<T> {

test_suite/tests/expand/generic_enum.expanded.rs

@@ -5,10 +5,10 @@ pub enum GenericEnum<T, U> {
     Seq(T, U),
     Map { x: T, y: U },
 }
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_GenericEnum: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<T, U> _serde::Serialize for GenericEnum<T, U>
@@ -108,10 +108,10 @@ const _IMPL_SERIALIZE_FOR_GenericEnum: () = {
         }
     }
 };
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_GenericEnum: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, T, U> _serde::Deserialize<'de> for GenericEnum<T, U>

test_suite/tests/expand/generic_struct.expanded.rs

@@ -2,10 +2,10 @@ use serde::{Deserialize, Serialize};
 pub struct GenericStruct<T> {
     x: T,
 }
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_GenericStruct: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<T> _serde::Serialize for GenericStruct<T>
@@ -36,10 +36,10 @@ const _IMPL_SERIALIZE_FOR_GenericStruct: () = {
         }
     }
 };
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_GenericStruct: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, T> _serde::Deserialize<'de> for GenericStruct<T>
@@ -398,10 +398,10 @@ const _IMPL_DESERIALIZE_FOR_GenericStruct: () = {
     }
 };
 pub struct GenericNewTypeStruct<T>(T);
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_GenericNewTypeStruct: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<T> _serde::Serialize for GenericNewTypeStruct<T>
@@ -420,10 +420,10 @@ const _IMPL_SERIALIZE_FOR_GenericNewTypeStruct: () = {
         }
     }
 };
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_GenericNewTypeStruct: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, T> _serde::Deserialize<'de> for GenericNewTypeStruct<T>

test_suite/tests/expand/generic_tuple_struct.expanded.rs

@@ -1,9 +1,9 @@
 use serde::{Deserialize, Serialize};
 pub struct GenericTupleStruct<T, U>(T, U);
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_GenericTupleStruct: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, T, U> _serde::Deserialize<'de> for GenericTupleStruct<T, U>

test_suite/tests/expand/lifetimes.expanded.rs

@@ -5,10 +5,10 @@ enum Lifetimes<'a> {
     LifetimeMap { a: &'a i32 },
     NoLifetimeMap { a: i32 },
 }
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_Lifetimes: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'a> _serde::Serialize for Lifetimes<'a> {
@@ -89,10 +89,10 @@ const _IMPL_SERIALIZE_FOR_Lifetimes: () = {
         }
     }
 };
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_Lifetimes: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, 'a> _serde::Deserialize<'de> for Lifetimes<'a> {

test_suite/tests/expand/named_map.expanded.rs

@@ -4,10 +4,10 @@ struct SerNamedMap<'a, 'b, A: 'a, B: 'b, C> {
     b: &'b mut B,
     c: C,
 }
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_SerNamedMap: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'a, 'b, A: 'a, B: 'b, C> _serde::Serialize for SerNamedMap<'a, 'b, A, B, C>
@@ -57,10 +57,10 @@ struct DeNamedMap<A, B, C> {
     b: B,
     c: C,
 }
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_DeNamedMap: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, A, B, C> _serde::Deserialize<'de> for DeNamedMap<A, B, C>

test_suite/tests/expand/named_tuple.expanded.rs

@@ -1,9 +1,9 @@
 use serde::{Deserialize, Serialize};
 struct SerNamedTuple<'a, 'b, A: 'a, B: 'b, C>(&'a A, &'b mut B, C);
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_SerNamedTuple: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'a, 'b, A: 'a, B: 'b, C> _serde::Serialize for SerNamedTuple<'a, 'b, A, B, C>
@@ -49,10 +49,10 @@ const _IMPL_SERIALIZE_FOR_SerNamedTuple: () = {
     }
 };
 struct DeNamedTuple<A, B, C>(A, B, C);
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_DeNamedTuple: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de, A, B, C> _serde::Deserialize<'de> for DeNamedTuple<A, B, C>

test_suite/tests/expand/named_unit.expanded.rs

@@ -1,9 +1,9 @@
 use serde::{Deserialize, Serialize};
 struct NamedUnit;
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_NamedUnit: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl _serde::Serialize for NamedUnit {
@@ -15,10 +15,10 @@ const _IMPL_SERIALIZE_FOR_NamedUnit: () = {
         }
     }
 };
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_NamedUnit: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de> _serde::Deserialize<'de> for NamedUnit {

test_suite/tests/expand/ser_enum.expanded.rs

@@ -10,10 +10,10 @@ where
     _Seq2(i8, B, &'a C, &'a mut D),
     _Map2 { a: i8, b: B, c: &'a C, d: &'a mut D },
 }
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_SerEnum: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'a, B: 'a, C: 'a, D> _serde::Serialize for SerEnum<'a, B, C, D>

test_suite/tests/expand/void.expanded.rs

@@ -1,9 +1,9 @@
 use serde::{Deserialize, Serialize};
 enum Void {}
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_SERIALIZE_FOR_Void: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl _serde::Serialize for Void {
@@ -15,10 +15,10 @@ const _IMPL_SERIALIZE_FOR_Void: () = {
         }
     }
 };
+#[doc(hidden)]
 #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
 const _IMPL_DESERIALIZE_FOR_Void: () = {
-    #[allow(unknown_lints)]
+    #[allow(rust_2018_idioms, clippy::useless_attribute)]
-    #[allow(rust_2018_idioms)]
     extern crate serde as _serde;
     #[automatically_derived]
     impl<'de> _serde::Deserialize<'de> for Void {

test_suite/tests/expandtest.rs

@@ -1,5 +1,5 @@
 #[cfg_attr(target_os = "emscripten", ignore)]
-#[cfg_attr(not(cargo_expand), ignore)]
+#[cfg_attr(not(expandtest), ignore)]
 #[rustversion::attr(not(nightly), ignore)]
 #[test]
 fn expandtest() {

test_suite/tests/test_gen.rs

@@ -265,7 +265,7 @@ fn test_gen() {
     #[cfg(feature = "unstable")]
     #[derive(Serialize, Deserialize)]
     struct NonAsciiIdents {
-        σ:  f64,
+        σ: f64,
     }
 
     #[derive(Serialize, Deserialize)]
@@ -691,6 +691,16 @@ fn test_gen() {
         #[serde(flatten, skip_deserializing)]
         flat: T,
     }
+
+    // https://github.com/serde-rs/serde/issues/1804
+    #[derive(Serialize, Deserialize)]
+    enum Message {
+        #[serde(skip)]
+        #[allow(dead_code)]
+        String(String),
+        #[serde(other)]
+        Unknown,
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////