Auto merge of #10242 - flip1995:rustup, r=flip1995

[rust.git] / clippy_dummy / build.rs

diff --git a/clippy_dummy/build.rs b/clippy_dummy/build.rs
index 97902feff86835cf7b0ade4468f9771d73e9ac3f..21af4f8244f44f93d5d2b73c5cde5af59162c8aa 100644 (file)
--- a/clippy_dummy/build.rs
+++ b/clippy_dummy/build.rs
@@ -1,42 +1,42 @@
-extern crate term;
+use term::color::{GREEN, RED, WHITE};
+use term::{Attr, Error, Result};
 
 fn main() {
-    if let Err(_) = foo() {
-        eprintln!("error: Clippy is no longer available via crates.io\n");
-        eprintln!("help: please run `rustup component add clippy-preview` instead");
+    if foo().is_err() {
+        eprintln!(
+            "error: Clippy is no longer available via crates.io\n\n\
+             help: please run `rustup component add clippy` instead"
+        );
     }
     std::process::exit(1);
 }
 
-fn foo() -> Result<(), ()> {
-    let mut t = term::stderr().ok_or(())?;
+fn foo() -> Result<()> {
+    let mut t = term::stderr().ok_or(Error::NotSupported)?;
 
-    t.attr(term::Attr::Bold).map_err(|_| ())?;
-    t.fg(term::color::RED).map_err(|_| ())?;
-    write!(t, "\nerror: ").map_err(|_| ())?;
+    t.attr(Attr::Bold)?;
+    t.fg(RED)?;
+    write!(t, "\nerror: ")?;
 
+    t.reset()?;
+    t.fg(WHITE)?;
+    writeln!(t, "Clippy is no longer available via crates.io\n")?;
 
-    t.reset().map_err(|_| ())?;
-    t.fg(term::color::WHITE).map_err(|_| ())?;
-    writeln!(t, "Clippy is no longer available via crates.io\n").map_err(|_| ())?;
+    t.attr(Attr::Bold)?;
+    t.fg(GREEN)?;
+    write!(t, "help: ")?;
 
+    t.reset()?;
+    t.fg(WHITE)?;
+    write!(t, "please run `")?;
 
-    t.attr(term::Attr::Bold).map_err(|_| ())?;
-    t.fg(term::color::GREEN).map_err(|_| ())?;
-    write!(t, "help: ").map_err(|_| ())?;
+    t.attr(Attr::Bold)?;
+    write!(t, "rustup component add clippy")?;
 
+    t.reset()?;
+    t.fg(WHITE)?;
+    writeln!(t, "` instead")?;
 
-    t.reset().map_err(|_| ())?;
-    t.fg(term::color::WHITE).map_err(|_| ())?;
-    write!(t, "please run `").map_err(|_| ())?;
-
-    t.attr(term::Attr::Bold).map_err(|_| ())?;
-    write!(t, "rustup component add clippy-preview").map_err(|_| ())?;
-
-    t.reset().map_err(|_| ())?;
-    t.fg(term::color::WHITE).map_err(|_| ())?;
-    writeln!(t, "` instead").map_err(|_| ())?;
-
-    t.reset().map_err(|_| ())?;
+    t.reset()?;
     Ok(())
-}
\ No newline at end of file
+}