build: Upgrade rust to 1.29.0 (getsentry#83)

Author: jan-auer

.travis.yml

@@ -17,10 +17,7 @@ env: # Needed for allow_failures
 matrix:
   include:
     - env: SUITE=format-check
-      install: rustup component add rustfmt-preview
     - env: SUITE=lint
-      install: rustup component add clippy-preview
-      rust: nightly
     - env: SUITE=check
       rust: "1.28.0"
     - env: SUITE=cargotest

Makefile

@@ -73,9 +73,11 @@ test: checkall cargotestall
 .PHONY: test
 
 format-check:
+	@rustup component add rustfmt-preview 2> /dev/null
 	@cargo fmt -- --check
 .PHONY: format-check
 
 lint:
-	@cargo +nightly clippy --all-features --tests -- -D clippy
+	@rustup component add clippy-preview 2> /dev/null
+	@cargo clippy --all-features --tests -- -D clippy
 .PHONY: lint

examples/failure-demo.rs

@@ -7,7 +7,11 @@ extern crate sentry;
 use sentry::integrations::failure::capture_error;
 
 #[derive(Fail, Debug)]
-#[fail(display = "An error occurred with error code {}. ({})", code, message)]
+#[fail(
+    display = "An error occurred with error code {}. ({})",
+    code,
+    message
+)]
 struct MyError {
     code: i32,
     message: String,

examples/thread-demo.rs

@@ -50,7 +50,7 @@ fn main() {
                 error!("Failing!");
             });
         }).join()
-            .unwrap();
-    }).join()
         .unwrap();
+    }).join()
+    .unwrap();
 }

integrations/sentry-actix/examples/basic.rs

@@ -22,6 +22,6 @@ fn main() {
             .middleware(SentryMiddleware::builder().emit_header(true).finish())
             .resource("/", |r| r.f(failing))
     }).bind("127.0.0.1:3001")
-        .unwrap()
-        .run();
+    .unwrap()
+    .run();
 }

integrations/sentry-actix/src/lib.rs

@@ -181,7 +181,7 @@ fn extract_request<S: 'static>(
             req.connection_info().host(),
             req.uri()
         ).parse()
-            .ok(),
+        .ok(),
         method: Some(req.method().to_string()),
         headers: req
             .headers()

src/backtrace_support.rs

@@ -98,8 +98,7 @@ pub fn demangle_symbol(s: &str) -> String {
                 "u22" => "\"",
                 _ => unreachable!(),
             }.to_string()
-        })
-        .to_string()
+        }).to_string()
 }
 
 #[allow(unused)]
@@ -139,8 +138,7 @@ pub fn backtrace_to_stacktrace(bt: &Backtrace) -> Option<Stacktrace> {
                     ..Default::default()
                 }
             })
-        })
-        .collect();
+        }).collect();
     Stacktrace::from_frames_reversed(frames)
 }
 
@@ -176,8 +174,7 @@ where
                     } else {
                         None
                     }
-                })
-                .next()
+                }).next()
         };
         let trunc = stacktrace.frames.len() - cutoff - 1;
         stacktrace.frames.truncate(trunc);

src/client.rs

@@ -136,8 +136,7 @@ impl fmt::Debug for ClientOptions {
             .field(
                 "before_send",
                 &BeforeBreadcrumbSet(self.before_breadcrumb.is_some()),
-            )
-            .finish()
+            ).finish()
     }
 }
 
@@ -339,7 +338,10 @@ impl Client {
     }
 
     #[doc(hidden)]
-    #[deprecated(since = "0.8.0", note = "Please use Client::with_options instead")]
+    #[deprecated(
+        since = "0.8.0",
+        note = "Please use Client::with_options instead"
+    )]
     pub fn with_dsn(dsn: Dsn) -> Client {
         let mut options = ClientOptions::default();
         options.dsn = Some(dsn);
@@ -361,20 +363,29 @@ impl Client {
     }
 
     #[doc(hidden)]
-    #[deprecated(since = "0.8.0", note = "Please use Client::with_options instead")]
+    #[deprecated(
+        since = "0.8.0",
+        note = "Please use Client::with_options instead"
+    )]
     pub fn with_dsn_and_options(dsn: Dsn, mut options: ClientOptions) -> Client {
         options.dsn = Some(dsn);
         Client::with_options(options)
     }
 
     #[doc(hidden)]
-    #[deprecated(since = "0.8.0", note = "Please use Client::with_options instead")]
+    #[deprecated(
+        since = "0.8.0",
+        note = "Please use Client::with_options instead"
+    )]
     pub fn disabled() -> Client {
         Client::with_options(Default::default())
     }
 
     #[doc(hidden)]
-    #[deprecated(since = "0.8.0", note = "Please use Client::with_options instead")]
+    #[deprecated(
+        since = "0.8.0",
+        note = "Please use Client::with_options instead"
+    )]
     pub fn disabled_with_options(options: ClientOptions) -> Client {
         Client {
             options,

src/integrations/failure.rs

@@ -79,8 +79,7 @@ fn parse_stacktrace(bt: &str) -> Option<Stacktrace> {
                     .map(|x| x.as_str().parse::<u64>().unwrap()),
                 ..Default::default()
             }
-        })
-        .collect();
+        }).collect();
 
     Stacktrace::from_frames_reversed(frames)
 }

src/transport.rs

@@ -211,7 +211,7 @@ impl HttpTransport {
             dsn,
             sender: Mutex::new(sender),
             shutdown_signal,
-            shutdown_immediately: shutdown_immediately,
+            shutdown_immediately,
             queue_size,
             _handle,
         }

tests/test_basic.rs

@@ -69,8 +69,7 @@ fn test_breadcrumbs() {
                 x.message.as_ref().map(|x| x.as_str()).unwrap(),
                 x.ty.as_str(),
             )
-        })
-        .collect();
+        }).collect();
     assert_eq!(
         messages,
         vec![