Merge remote-tracking branch 'upstream/master' into rustup

[rust.git] / rustc_tools_util / README.md

diff --git a/rustc_tools_util/README.md b/rustc_tools_util/README.md
index 79c90b86b6cfdcb7974551fc945bbbaf7a8f8741..6027538dc4ab22a74ee3a0299a2849667b450dcf 100644 (file)
--- a/rustc_tools_util/README.md
+++ b/rustc_tools_util/README.md
@@ -32,7 +32,7 @@ fn main() {
     );
     println!(
         "cargo:rustc-env=RUSTC_RELEASE_CHANNEL={}",
-        rustc_tools_util::get_channel_from_compiler_output().unwrap_or_default()
+        rustc_tools_util::get_channel().unwrap_or_default()
     );
 }
 
@@ -53,7 +53,7 @@ This gives the following output in clippy:
 
 ## License
 
-Copyright 2014-2019 The Rust Project Developers
+Copyright 2014-2020 The Rust Project Developers
 
 Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 http://www.apache.org/licenses/LICENSE-2.0> or the MIT license