about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-02 14:56:11 +0000
committerbors <bors@rust-lang.org>2017-05-02 14:56:11 +0000
commited1f26ddda15b2bcf613a257e813e8b02ee14dff (patch)
tree4bc9cd842d2113827d984404610e91f183dd62bd /src/libcore
parent96e2c34286099eea4f51daaadbb82a8fbe99e0f6 (diff)
parente0bfd19add662c07eb102818ce579315ddc90094 (diff)
downloadrust-ed1f26ddda15b2bcf613a257e813e8b02ee14dff.tar.gz
rust-ed1f26ddda15b2bcf613a257e813e8b02ee14dff.zip
Auto merge of #41702 - frewsxcv:rollup, r=frewsxcv
Rollup of 6 pull requests

- Successful merges: #41661, #41662, #41673, #41688, #41692, #41693
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/convert.rs2
-rw-r--r--src/libcore/hash/sip.rs4
-rw-r--r--src/libcore/ops.rs4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
index 084736685e3..21c75ad3395 100644
--- a/src/libcore/convert.rs
+++ b/src/libcore/convert.rs
@@ -276,7 +276,7 @@ pub trait Into<T>: Sized {
 pub trait From<T>: Sized {
     /// Performs the conversion.
     #[stable(feature = "rust1", since = "1.0.0")]
-    fn from(T) -> Self;
+    fn from(_: T) -> Self;
 }
 
 /// An attempted conversion that consumes `self`, which may or may not be
diff --git a/src/libcore/hash/sip.rs b/src/libcore/hash/sip.rs
index 5f5d07b6682..db12496b6f3 100644
--- a/src/libcore/hash/sip.rs
+++ b/src/libcore/hash/sip.rs
@@ -403,8 +403,8 @@ impl<S: Sip> Default for Hasher<S> {
 
 #[doc(hidden)]
 trait Sip {
-    fn c_rounds(&mut State);
-    fn d_rounds(&mut State);
+    fn c_rounds(_: &mut State);
+    fn d_rounds(_: &mut State);
 }
 
 #[derive(Debug, Clone, Default)]
diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs
index 175b3a5a69a..391b606f613 100644
--- a/src/libcore/ops.rs
+++ b/src/libcore/ops.rs
@@ -2878,10 +2878,10 @@ pub trait Carrier {
     type Error;
 
     /// Create a `Carrier` from a success value.
-    fn from_success(Self::Success) -> Self;
+    fn from_success(_: Self::Success) -> Self;
 
     /// Create a `Carrier` from an error value.
-    fn from_error(Self::Error) -> Self;
+    fn from_error(_: Self::Error) -> Self;
 
     /// Translate this `Carrier` to another implementation of `Carrier` with the
     /// same associated types.