diff options
| -rw-r--r-- | src/libcore/convert.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/highlight.rs | 2 |
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<()>; } |