ref: Upgrade to Rust Edition 2018 (#120)

jan-auer · web-flow · commit e28369a51f6b · 2019-01-11T15:37:33.000+01:00
* meta: Add disclaimer on Rust version

* build: Switch to Rust Edition 2018

* ref: Fix edition 2018 idioms

* ref: Rename sentry_crate_release to sentry::release_name

* ref: Fix feature gated code

* fix: Macro imports for error_chain

* ref: Fix import in windows code
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,6 +11,7 @@ description = """
 Sentry (getsentry.com) client for rust ;)
 """
 build = "build.rs"
+edition = "2018"
 autoexamples = true
 
 [package.metadata.docs.rs]
diff --git a/README.md b/README.md
@@ -25,6 +25,8 @@ We currently only verify this crate against a recent version of Sentry hosted on
 [sentry.io](https://sentry.io/) but it should work with on-prem Sentry versions
 8.20 and later.
 
+Additionally, the lowest Rust version we target is _1.31.0_.
+
 ## Resources
 
 - [crates.io](https://crates.io/crates/sentry)
diff --git a/build.rs b/build.rs
@@ -1,6 +1,3 @@
-#[cfg(feature = "with_rust_info")]
-extern crate rustc_version;
-
 use std::env;
 use std::fs::File;
 use std::io::Write;
diff --git a/examples/before-send.rs b/examples/before-send.rs
@@ -1,5 +1,3 @@
-extern crate sentry;
-
 use std::sync::Arc;
 
 fn main() {
diff --git a/examples/error-chain-demo.rs b/examples/error-chain-demo.rs
@@ -1,7 +1,5 @@
 #[macro_use]
 extern crate error_chain;
-#[macro_use]
-extern crate sentry;
 
 use sentry::integrations::error_chain::capture_error_chain;
 
@@ -25,7 +23,7 @@ fn main() {
                 .parse()
                 .unwrap(),
         ),
-        release: sentry_crate_release!(),
+        release: sentry::release_name!(),
         ..Default::default()
     });
 
diff --git a/examples/event-processors.rs b/examples/event-processors.rs
@@ -1,5 +1,3 @@
-extern crate sentry;
-
 fn main() {
     let client =
         sentry::Client::from_config("https://a94ae32be2584e0bbd7a4cbb95971fee@sentry.io/1041156");
diff --git a/examples/failure-demo.rs b/examples/failure-demo.rs
@@ -1,9 +1,4 @@
-extern crate failure;
-#[macro_use]
-extern crate failure_derive;
-#[macro_use]
-extern crate sentry;
-
+use failure::Fail;
 use sentry::integrations::failure::capture_error;
 
 #[derive(Fail, Debug)]
@@ -25,7 +20,7 @@ fn main() {
     let _sentry = sentry::init((
         "https://a94ae32be2584e0bbd7a4cbb95971fee@sentry.io/1041156",
         sentry::ClientOptions {
-            release: sentry_crate_release!(),
+            release: sentry::release_name!(),
             ..Default::default()
         },
     ));
diff --git a/examples/init-with-client.rs b/examples/init-with-client.rs
@@ -1,5 +1,3 @@
-extern crate sentry;
-
 fn main() {
     let client =
         sentry::Client::from_config("https://a94ae32be2584e0bbd7a4cbb95971fee@sentry.io/1041156");
diff --git a/examples/log-demo.rs b/examples/log-demo.rs
@@ -1,15 +1,10 @@
-extern crate log;
-extern crate pretty_env_logger;
-extern crate sentry;
-
 use log::{debug, error, info, warn};
-use sentry::sentry_crate_release;
 
 fn main() {
     let _sentry = sentry::init((
         "https://a94ae32be2584e0bbd7a4cbb95971fee@sentry.io/1041156",
         sentry::ClientOptions {
-            release: sentry_crate_release!(),
+            release: sentry::release_name!(),
             ..Default::default()
         },
     ));
diff --git a/examples/message-demo.rs b/examples/message-demo.rs
@@ -1,5 +1,3 @@
-extern crate sentry;
-
 fn main() {
     let _sentry = sentry::init("https://a94ae32be2584e0bbd7a4cbb95971fee@sentry.io/1041156");
     sentry::configure_scope(|scope| {
diff --git a/examples/panic-demo.rs b/examples/panic-demo.rs
@@ -1,11 +1,8 @@
-#[macro_use]
-extern crate sentry;
-
 fn main() {
     let _sentry = sentry::init((
         "https://a94ae32be2584e0bbd7a4cbb95971fee@sentry.io/1041156",
         sentry::ClientOptions {
-            release: sentry_crate_release!(),
+            release: sentry::release_name!(),
             ..Default::default()
         },
     ));
diff --git a/examples/send-with-extra.rs b/examples/send-with-extra.rs
@@ -1,5 +1,3 @@
-extern crate sentry;
-
 fn main() {
     let _sentry = sentry::init("https://a94ae32be2584e0bbd7a4cbb95971fee@sentry.io/1041156");
 
diff --git a/examples/thread-demo.rs b/examples/thread-demo.rs
@@ -1,9 +1,3 @@
-#[macro_use]
-extern crate log;
-extern crate pretty_env_logger;
-#[macro_use]
-extern crate sentry;
-
 use std::sync::Arc;
 use std::thread;
 
@@ -14,7 +8,7 @@ fn main() {
     let _sentry = sentry::init((
         "https://a94ae32be2584e0bbd7a4cbb95971fee@sentry.io/1041156",
         sentry::ClientOptions {
-            release: sentry_crate_release!(),
+            release: sentry::release_name!(),
             ..Default::default()
         },
     ));
@@ -25,12 +19,12 @@ fn main() {
     sentry::integrations::panic::register_panic_handler();
 
     // the log integration sends to Hub::current()
-    info!("Spawning thread");
+    log::info!("Spawning thread");
 
     thread::spawn(|| {
         // The thread spawned here gets a new hub cloned from the hub of the
         // main thread.
-        info!("Spawned thread, configuring scope.");
+        log::info!("Spawned thread, configuring scope.");
 
         // now we want to create a new hub based on the thread's normal hub for
         // working with it explicitly.
@@ -47,7 +41,7 @@ fn main() {
             sentry::Hub::run(hub, || {
                 // the log integration picks up the Hub::current which is now bound
                 // to the outer hub.
-                error!("Failing!");
+                log::error!("Failing!");
             });
         })
         .join()
diff --git a/integrations/sentry-actix/Cargo.toml b/integrations/sentry-actix/Cargo.toml
@@ -10,6 +10,7 @@ documentation = "https://docs.rs/sentry-actix"
 description = """
 Sentry client extension for actix-web
 """
+edition = "2018"
 
 [dependencies]
 actix-web = { version = "0.7", default-features = false }
diff --git a/integrations/sentry-actix/examples/basic.rs b/integrations/sentry-actix/examples/basic.rs
@@ -1,7 +1,3 @@
-extern crate actix_web;
-extern crate sentry;
-extern crate sentry_actix;
-
 use std::env;
 use std::io;
 
diff --git a/integrations/sentry-actix/src/lib.rs b/integrations/sentry-actix/src/lib.rs
@@ -74,10 +74,6 @@
 //! });
 //! # }
 //! ```
-extern crate actix_web;
-extern crate failure;
-extern crate fragile;
-extern crate sentry;
 
 use std::borrow::Cow;
 use std::cell::RefCell;
@@ -326,7 +322,7 @@ impl ActixWebHubExt for Hub {
 
     fn capture_actix_error(&self, err: &Error) -> Uuid {
         let mut exceptions = vec![];
-        let mut ptr: Option<&Fail> = Some(err.as_fail());
+        let mut ptr: Option<&dyn Fail> = Some(err.as_fail());
         let mut idx = 0;
         while let Some(fail) = ptr {
             // Check whether the failure::Fail held by err is a failure::Error wrapped in Compat
diff --git a/src/backtrace_support.rs b/src/backtrace_support.rs
@@ -5,7 +5,7 @@ use regex::{Captures, Regex};
 
 use crate::protocol::{Frame, Stacktrace};
 
-lazy_static! {
+lazy_static::lazy_static! {
     static ref HASH_FUNC_RE: Regex = Regex::new(r#"(?x)
         ^(.*)::h[a-f0-9]{16}$
     "#).unwrap();
@@ -27,6 +27,7 @@ pub static ref WELL_KNOWN_SYS_MODULES: Vec<&'static str> = {
     }
     rv
 };
+
 pub static ref WELL_KNOWN_BORDER_FRAMES: Vec<&'static str> = {
     #[allow(unused_mut)]
     let mut rv = vec![
@@ -44,6 +45,7 @@ pub static ref WELL_KNOWN_BORDER_FRAMES: Vec<&'static str> = {
     }
     rv
 };
+
 pub static ref SECONDARY_BORDER_FRAMES: Vec<(&'static str, &'static str)> = {
     #![allow(unused_mut)]
     let mut rv = Vec::new();
@@ -74,7 +76,7 @@ pub fn strip_symbol(s: &str) -> &str {
 
 pub fn demangle_symbol(s: &str) -> String {
     COMMON_RUST_SYMBOL_ESCAPES_RE
-        .replace_all(s, |caps: &Captures| {
+        .replace_all(s, |caps: &Captures<'_>| {
             match &caps[1] {
                 "SP" => "@",
                 "BP" => "*",
diff --git a/src/client.rs b/src/client.rs
@@ -21,11 +21,11 @@ use crate::utils;
 /// The Sentry client object.
 pub struct Client {
     options: ClientOptions,
-    transport: RwLock<Option<Arc<Box<Transport>>>>,
+    transport: RwLock<Option<Arc<Box<dyn Transport>>>>,
 }
 
 impl fmt::Debug for Client {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Client")
             .field("dsn", &self.dsn())
             .field("options", &self.options)
@@ -43,7 +43,7 @@ impl Clone for Client {
 }
 
 /// Type alias for before event/breadcrumb handlers.
-pub type BeforeCallback<T> = Arc<Box<Fn(T) -> Option<T> + Send + Sync>>;
+pub type BeforeCallback<T> = Arc<Box<dyn Fn(T) -> Option<T> + Send + Sync>>;
 
 /// Configuration settings for the client.
 pub struct ClientOptions {
@@ -54,7 +54,7 @@ pub struct ClientOptions {
     /// This is typically either a boxed function taking the client options by
     /// reference and returning a `Transport`, a boxed `Arc<Transport>` or
     /// alternatively the `DefaultTransportFactory`.
-    pub transport: Box<TransportFactory>,
+    pub transport: Box<dyn TransportFactory>,
     /// module prefixes that are always considered in_app
     pub in_app_include: Vec<&'static str>,
     /// module prefixes that are never in_app
@@ -107,7 +107,7 @@ pub struct ClientOptions {
 impl RefUnwindSafe for ClientOptions {}
 
 impl fmt::Debug for ClientOptions {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         #[derive(Debug)]
         struct TransportFactory;
         #[derive(Debug)]
@@ -207,7 +207,7 @@ impl Default for ClientOptions {
     }
 }
 
-lazy_static! {
+lazy_static::lazy_static! {
     static ref CRATE_RE: Regex = Regex::new(r"^(?:_<)?([a-zA-Z0-9_]+?)(?:\.\.|::)").unwrap();
 }
 
@@ -385,7 +385,7 @@ impl Client {
         mut event: Event<'static>,
         scope: Option<&Scope>,
     ) -> Option<Event<'static>> {
-        lazy_static! {
+        lazy_static::lazy_static! {
             static ref DEBUG_META: DebugMeta = DebugMeta {
                 images: utils::debug_images(),
                 ..Default::default()
diff --git a/src/constants.rs b/src/constants.rs
@@ -5,7 +5,7 @@ pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
 include!(concat!(env!("OUT_DIR"), "/constants.gen.rs"));
 
-lazy_static! {
+lazy_static::lazy_static! {
     pub static ref USER_AGENT: String = format!("sentry.rust/{}", VERSION);
     pub static ref SDK_INFO: ClientSdkInfo = ClientSdkInfo {
         name: "sentry-rust".into(),
diff --git a/src/hub.rs b/src/hub.rs
@@ -15,7 +15,7 @@ use crate::scope::{Scope, ScopeGuard};
 use crate::{client::Client, scope::Stack, utils};
 
 #[cfg(feature = "with_client_implementation")]
-lazy_static! {
+lazy_static::lazy_static! {
     static ref PROCESS_HUB: (Arc<Hub>, thread::ThreadId) = (
         Arc::new(Hub::new(None, Arc::new(Default::default()))),
         thread::current().id()
diff --git a/src/integrations/failure.rs b/src/integrations/failure.rs
@@ -35,7 +35,7 @@ use crate::hub::Hub;
 use crate::internals::Uuid;
 use crate::protocol::{Event, Exception, Frame, Level, Stacktrace};
 
-lazy_static! {
+lazy_static::lazy_static! {
     static ref MODULE_SPLIT_RE: Regex = Regex::new(r"^(.*)::(.*?)$").unwrap();
     static ref FRAME_RE: Regex = Regex::new(
         r#"(?xm)
@@ -160,7 +160,7 @@ pub fn event_from_error(err: &failure::Error) -> Event<'static> {
 pub fn event_from_fail<F: Fail + ?Sized>(fail: &F) -> Event<'static> {
     let mut exceptions = vec![exception_from_single_fail(fail, fail.backtrace())];
 
-    let mut ptr: Option<&Fail> = None;
+    let mut ptr: Option<&dyn Fail> = None;
     while let Some(cause) = ptr.map(Fail::cause).unwrap_or_else(|| fail.cause()) {
         exceptions.push(exception_from_single_fail(cause, cause.backtrace()));
         ptr = Some(cause);
diff --git a/src/integrations/log.rs b/src/integrations/log.rs
diff --git a/src/integrations/panic.rs b/src/integrations/panic.rs
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/macros.rs b/src/macros.rs
diff --git a/src/scope/noop.rs b/src/scope/noop.rs
diff --git a/src/scope/real.rs b/src/scope/real.rs
diff --git a/src/test.rs b/src/test.rs
diff --git a/src/transport.rs b/src/transport.rs
diff --git a/src/utils.rs b/src/utils.rs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-extern crate sentry;`
`2`		`-`
`3`	`1`	`use std::sync::Arc;`
`4`	`2`
`5`	`3`	`fn main() {`