edition, clippy misc

Author: ijl

Cargo.lock

@@ -4,6 +4,7 @@ use crate::exc::*;
 use crate::typeref::*;
 use associative_cache::replacement::RoundRobinReplacement;
 use associative_cache::*;
+use lazy_static::lazy_static;
 use pyo3::prelude::*;
 use serde::de::{self, DeserializeSeed, Deserializer, MapAccess, SeqAccess, Visitor};
 use smallvec::SmallVec;

src/decode.rs

@@ -1,5 +1,8 @@
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+use pyo3::create_exception;
+use pyo3::import_exception;
+
 pub const INVALID_STR: &str = "str is not valid UTF-8: surrogates not allowed";
 
 import_exception!(json, JSONDecodeError);

src/exc.rs

@@ -3,22 +3,8 @@
 #![feature(core_intrinsics)]
 #![feature(const_fn)]
 
-#[macro_use]
-extern crate pyo3;
-
-#[macro_use]
-extern crate lazy_static;
-
-extern crate associative_cache;
-extern crate encoding_rs;
-extern crate itoa;
-extern crate parking_lot;
-extern crate serde;
-extern crate serde_json;
-extern crate smallvec;
-extern crate wyhash;
-
 use pyo3::prelude::*;
+use pyo3::wrap_pyfunction;
 use pyo3::AsPyPointer;
 use std::os::raw::c_char;
 use std::ptr::NonNull;
@@ -94,14 +80,14 @@ pub fn dumps(
     option: Option<PyObject>,
 ) -> PyResult<PyObject> {
     let pydef: Option<NonNull<pyo3::ffi::PyObject>>;
-    if default.is_some() {
-        pydef = Some(unsafe { NonNull::new_unchecked(default.unwrap().as_ptr()) });
+    if let Some(value) = default {
+        pydef = Some(unsafe { NonNull::new_unchecked(value.as_ptr()) });
     } else {
         pydef = None
     };
     let optsbits: i8;
-    if option.is_some() {
-        let optsptr = option.unwrap().as_ptr();
+    if let Some(value) = option {
+        let optsptr = value.as_ptr();
         if unsafe { (*optsptr).ob_type != typeref::INT_PTR } {
             return Err(exc::JSONEncodeError::py_err("Invalid opts"));
         } else {