Auto merge of #857 - brson:rustup-1, r=alexcrichton

Bump version to 1.0 r? @alexcrichton
rust-lang · Dec 16, 2016 · dcacbf6 · dcacbf6
2 parents 05709b9 + 42dd694
commit dcacbf6
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# 1.0.0
+
+No significant changes from 0.7.0.
+
+Contributors: Alex Crichton, Andrew Koroluk, Arch, benaryorg, Benedikt Reinartz,
+Björn Steinbrink, bors, Boutin, Michael, Brian Anderson, Cam Swords, Chungmin
+Park, Corey Farwell, Daniel Keep, David Salter, Diggory Blake, Drew Fisher,
+Erick Tryzelaar, Florian Gilcher, geemili, Guillaume Fraux, Ivan Nejgebauer,
+Ivan Petkov, Jacob Shaffer, Jake Goldsborough, James Lucas, Jeremiah Peschka,
+jethrogb, Jian Zeng, Jimmy Cuadra, Joe Wilm, Jorge Aparicio, Josh Machol, Josh
+Stone, Julien Blanchard, Kai Noda, Kai Roßwag, Kamal Marhubi, Kevin K, Kevin
+Rauwolf, Kevin Yap, Knight, leonardo.yvens, llogiq, Marco A L Barbosa, Martin
+Pool, Matt Brubeck, mdinger, Michael DeWitt, Mika Attila, Nate Mara, NODA, Kai,
+Oliver Schneider, Patrick Reisert, Paul Padier, Ralph Giles, Raphael Cohn, Ri,
+Ricardo Martins, Ryan Havar, Ryan Kung, Severen Redwood, Tad Hardesty, Taylor
+Cramer, theindigamer, Tim Neumann, Tobias Bucher, trolleyman, Vadim
+Petrochenkov, Virgile Andreani, V Jackson, Vladimir, Wang Xuerui, Wayne Warren,
+Wesley Moore, Yasushi Abe, Y. T. Chung
+
 # 0.7.0
 
 * [Correctly "detect" host endianness on MIPS](https://github.com/rust-lang-nursery/rustup.rs/pull/802)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup"
-version = "0.7.0"
+version = "1.0.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "multirust in rust - manage multiple rust installations with ease"
 
@@ -32,8 +32,8 @@ no-self-update = []
 msi-installed = []
 
 [dependencies]
-rustup-dist = { path = "src/rustup-dist", version = "0.7.0" }
-rustup-utils = { path = "src/rustup-utils", version = "0.7.0" }
+rustup-dist = { path = "src/rustup-dist", version = "1.0.0" }
+rustup-utils = { path = "src/rustup-utils", version = "1.0.0" }
 download = { path = "src/download" }
 error-chain = "0.7.1"
 clap = "2.18.0"
@@ -60,7 +60,7 @@ kernel32-sys = "0.2.1"
 gcc = "0.3.28"
 
 [dev-dependencies]
-rustup-mock = { path = "src/rustup-mock", version = "0.7.0" }
+rustup-mock = { path = "src/rustup-mock", version = "1.0.0" }
 lazy_static = "0.1.15"
 
 [workspace]

diff --git a/README.md b/README.md
@@ -13,8 +13,6 @@ And it runs on all platforms Rust supports, including Windows.
 
 [The Rust Programming Language]: https://www.rust-lang.org
 
-**WARNING: This is beta software.**
-
 * [Installation](#installation)
 * [How rustup works](#how-rustup-works)
 * [Keeping Rust up to date](#keeping-rust-up-to-date)

diff --git a/src/rustup-cli/self_update.rs b/src/rustup-cli/self_update.rs
@@ -78,8 +78,6 @@ r#"
 
 You can uninstall at any time with `rustup self uninstall` and
 these changes will be reverted.
-
-*WARNING*: This is beta software.
 "#
     )};
 }

diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-dist"
-version = "0.7.0"
+version = "1.0.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Installation from a Rust distribution server"
 build = "build.rs"
@@ -23,9 +23,9 @@ tempdir = "0.3.4"
 walkdir = "0.1.5"
 toml = "0.1.27"
 sha2 = "0.1.2"
-rustup-utils = { path = "../rustup-utils", version = "0.7.0" }
+rustup-utils = { path = "../rustup-utils", version = "1.0.0" }
 error-chain = "0.7.1"
-rustup-mock = { path = "../rustup-mock", version = "0.7.0" }
+rustup-mock = { path = "../rustup-mock", version = "1.0.0" }
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.8"

diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-mock"
-version = "0.7.0"
+version = "1.0.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Test mocks for multirust"
 
@@ -19,7 +19,7 @@ tempdir = "0.3.4"
 itertools = "0.4.1"
 tar = "0.4.0"
 toml = "0.1.27"
-rustup-utils = { path = "../rustup-utils", version = "0.7.0" }
+rustup-utils = { path = "../rustup-utils", version = "1.0.0" }
 sha2 = "0.1.2"
 wait-timeout = "0.1.3"
 

diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-utils"
-version = "0.7.0"
+version = "1.0.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "multirust in rust - manage multiple rust installations with ease"
 

diff --git a/src/rustup-win-installer/Cargo.toml b/src/rustup-win-installer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustup-win-installer"
-version = "0.7.0"
+version = "1.0.0"
 authors = ["Patrick Reisert"]
 build = "build.rs"
 
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 winapi = "0.2"
-rustup = { path = "../../", version = "0.7.0" }
+rustup = { path = "../../", version = "1.0.0" }
diff --git a/www/index.html b/www/index.html
@@ -82,10 +82,6 @@
   </div>
 </div>
 
-<p id="warning">
-WARNING: This is beta software.
-</p>
-
 <p>
   Need help? <a href="https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-beginners">Ask on #rust-beginners</a>.
 </p>

diff --git a/www/rustup.css b/www/rustup.css
@@ -130,11 +130,6 @@ hr {
     line-height: 2rem;
 }
 
-#warning {
-    color: red;
-    font-weight: 500;
-}
-
 #about {
     font-size: 16px;
     line-height: 2em;
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,8 +78,6 @@ r#" @@
     You can uninstall at any time with `rustup self uninstall` and
     these changes will be reverted.
-    *WARNING*: This is beta software.
     "#
         )};
     }
@@ Expand Down @@