about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2017-05-02 06:35:36 +0200
committerest31 <MTest31@outlook.com>2017-05-02 06:35:36 +0200
commit14bbd0a5a3722bdcb4c5f36d81097e1fb992add3 (patch)
treebf980f810ecad89856c79a0bf949b083e2846d82 /src
parentd290849a233bb2b06b01167c242b3886d2cf8681 (diff)
downloadrust-14bbd0a5a3722bdcb4c5f36d81097e1fb992add3.tar.gz
rust-14bbd0a5a3722bdcb4c5f36d81097e1fb992add3.zip
Address review
Diffstat (limited to 'src')
-rw-r--r--src/libcore/convert.rs2
-rw-r--r--src/librustdoc/html/highlight.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
index f5dc38e8aab..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: T) -> Self;
+    fn from(_: T) -> Self;
 }
 
 /// An attempted conversion that consumes `self`, which may or may not be
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
index c1f1cb43e41..a40d1e6bdc9 100644
--- a/src/librustdoc/html/highlight.rs
+++ b/src/librustdoc/html/highlight.rs
@@ -134,7 +134,7 @@ pub trait Writer {
     fn string<T: Display>(&mut self,
                           text: T,
                           klass: Class,
-                          tas: Option<&TokenAndSpan>)
+                          tok: Option<&TokenAndSpan>)
                           -> io::Result<()>;
 }