Merge pull request #521 from knight42/change-static-site

brson · web-flow · commit 500982368db4 · 2016-06-17T13:06:24.000+01:00
Change upstream via $RUSTUP_DIST_SERVER
diff --git a/README.md b/README.md
@@ -357,11 +357,14 @@ Command | Description
   invocations. A toolchain with this name should be installed, or
   invocations will fail.
 
-- `RUSTUP_DIST_ROOT` (default: `https://static.rust-lang.org/dist`)
-  Sets the root URL for downloading Rust toolchains and release
-  channel updates. You can change this to instead use a local mirror,
+- `RUSTUP_DIST_SERVER` (default: `https://static.rust-lang.org`)
+  Sets the root URL for downloading static resources related to Rust.
+  You can change this to instead use a local mirror,
   or to test the binaries from the staging directory.
 
+- `RUSTUP_DIST_ROOT` (default: `https://static.rust-lang.org/dist`)
+  Deprecated. Use `RUSTUP_DIST_SERVER` instead.
+
 - `RUSTUP_UPDATE_ROOT` (default `https://static.rust-lang.org/rustup/dist`)
   Sets the root URL for downloading self-updates.
 
diff --git a/src/rustup-dist/src/dist.rs b/src/rustup-dist/src/dist.rs
@@ -15,9 +15,12 @@ use std::env;
 use regex::Regex;
 use sha2::{Sha256, Digest};
 
-pub const DEFAULT_DIST_ROOT: &'static str = "https://static.rust-lang.org/dist";
+pub const DEFAULT_DIST_SERVER: &'static str = "https://static.rust-lang.org";
 pub const UPDATE_HASH_LEN: usize = 20;
 
+// Deprecated
+pub const DEFAULT_DIST_ROOT: &'static str = "https://static.rust-lang.org/dist";
+
 // A toolchain descriptor from rustup's perspective. These contain
 // 'partial target triples', which allow toolchain names like
 // 'stable-msvc' to work. Partial target triples though are parsed
diff --git a/src/rustup-dist/src/manifestation.rs b/src/rustup-dist/src/manifestation.rs
@@ -3,7 +3,7 @@
 
 use config::Config;
 use manifest::{Component, Manifest, TargettedPackage};
-use dist::{download_and_check, DownloadCfg, TargetTriple};
+use dist::{download_and_check, DownloadCfg, TargetTriple, DEFAULT_DIST_SERVER};
 use component::{Components, Transaction, TarGzPackage, Package};
 use temp;
 use errors::*;
@@ -122,13 +122,20 @@ impl Manifestation {
             components_urls_and_hashes.push(c_u_h);
         }
 
+        let altered = temp_cfg.dist_server != DEFAULT_DIST_SERVER;
+
         // Download component packages and validate hashes
         let mut things_to_install: Vec<(Component, temp::File)> = Vec::new();
         for (component, url, hash) in components_urls_and_hashes {
 
             notify_handler(Notification::DownloadingComponent(&component.pkg,
                                                               &self.target_triple,
                                                               &component.target));
+            let url = if altered {
+                url.replace(DEFAULT_DIST_SERVER, temp_cfg.dist_server.as_str())
+            } else {
+                url
+            };
 
             // Download each package to temp file
             let temp_file = try!(temp_cfg.new_file());
@@ -301,7 +308,8 @@ impl Manifestation {
             return Err(format!("binary package was not provided for '{}'",
                                self.target_triple.to_string()).into());
         }
-        let url = url.unwrap();
+        // Only replace once. The cost is inexpensive.
+        let url = url.unwrap().replace(DEFAULT_DIST_SERVER, temp_cfg.dist_server.as_str());
 
         notify_handler(Notification::DownloadingComponent("rust",
                                                           &self.target_triple,
diff --git a/src/rustup-dist/src/temp.rs b/src/rustup-dist/src/temp.rs
@@ -37,6 +37,7 @@ pub enum Notification<'a> {
 
 pub struct Cfg {
     root_directory: PathBuf,
+    pub dist_server: String,
     notify_handler: Box<Fn(Notification)>,
 }
 
@@ -131,9 +132,10 @@ impl Display for Error {
 }
 
 impl Cfg {
-    pub fn new(root_directory: PathBuf, notify_handler: Box<Fn(Notification)>) -> Self {
+    pub fn new(root_directory: PathBuf, dist_server: &str, notify_handler: Box<Fn(Notification)>) -> Self {
         Cfg {
             root_directory: root_directory,
+            dist_server: dist_server.to_owned(),
             notify_handler: notify_handler,
         }
     }
diff --git a/src/rustup-dist/tests/dist.rs b/src/rustup-dist/tests/dist.rs
@@ -17,7 +17,7 @@ use rustup_mock::{MockCommand, MockInstallerBuilder};
 use rustup_dist::prefix::InstallPrefix;
 use rustup_dist::ErrorKind;
 use rustup_dist::errors::Result;
-use rustup_dist::dist::{ToolchainDesc, TargetTriple};
+use rustup_dist::dist::{ToolchainDesc, TargetTriple, DEFAULT_DIST_SERVER};
 use rustup_dist::download::DownloadCfg;
 use rustup_dist::Notification;
 use rustup_utils::utils;
@@ -319,6 +319,7 @@ fn setup(edit: Option<&Fn(&str, &mut MockPackage)>,
 
     let work_tempdir = TempDir::new("multirust").unwrap();
     let ref temp_cfg = temp::Cfg::new(work_tempdir.path().to_owned(),
+                                      DEFAULT_DIST_SERVER,
                                       Box::new(|_| ()));
 
     let ref url = Url::parse(&format!("file://{}", dist_tempdir.path().to_string_lossy())).unwrap();
diff --git a/src/rustup-dist/tests/install.rs b/src/rustup-dist/tests/install.rs
@@ -6,6 +6,7 @@ extern crate tempdir;
 use rustup_dist::component::Components;
 use rustup_dist::component::{DirectoryPackage, Package};
 use rustup_dist::component::Transaction;
+use rustup_dist::dist::DEFAULT_DIST_SERVER;
 use rustup_dist::temp;
 use rustup_dist::ErrorKind;
 use rustup_dist::Notification;
@@ -109,7 +110,7 @@ fn basic_install() {
     let prefix = InstallPrefix::from(instdir.path().to_owned());
 
     let tmpdir = TempDir::new("multirust").unwrap();
-    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), Box::new(|_| ()));
+    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
     let notify = |_: Notification| ();
     let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
 
@@ -147,7 +148,7 @@ fn multiple_component_install() {
     let prefix = InstallPrefix::from(instdir.path().to_owned());
 
     let tmpdir = TempDir::new("multirust").unwrap();
-    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), Box::new(|_| ()));
+    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
     let notify = |_: Notification| ();
     let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
 
@@ -190,7 +191,7 @@ fn uninstall() {
     let prefix = InstallPrefix::from(instdir.path().to_owned());
 
     let tmpdir = TempDir::new("multirust").unwrap();
-    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), Box::new(|_| ()));
+    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
     let notify = |_: Notification| ();
     let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
 
@@ -242,7 +243,7 @@ fn component_bad_version() {
     let prefix = InstallPrefix::from(instdir.path().to_owned());
 
     let tmpdir = TempDir::new("multirust").unwrap();
-    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), Box::new(|_| ()));
+    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
     let notify = |_: Notification| ();
     let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
 
@@ -288,7 +289,7 @@ fn unix_permissions() {
     let prefix = InstallPrefix::from(instdir.path().to_owned());
 
     let tmpdir = TempDir::new("multirust").unwrap();
-    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), Box::new(|_| ()));
+    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
     let notify = |_: Notification| ();
     let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
 
@@ -332,7 +333,7 @@ fn install_to_prefix_that_does_not_exist() {
     let prefix = InstallPrefix::from(does_not_exist.clone());
 
     let tmpdir = TempDir::new("multirust").unwrap();
-    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), Box::new(|_| ()));
+    let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
     let notify = |_: Notification| ();
     let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
 
diff --git a/src/rustup-dist/tests/transactions.rs b/src/rustup-dist/tests/transactions.rs
diff --git a/src/rustup-mock/src/clitools.rs b/src/rustup-mock/src/clitools.rs
diff --git a/src/rustup/config.rs b/src/rustup/config.rs

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ pub enum Notification<'a> {`
`37`	`37`
`38`	`38`	`pub struct Cfg {`
`39`	`39`	`root_directory: PathBuf,`
	`40`	`+ pub dist_server: String,`
`40`	`41`	`notify_handler: Box<Fn(Notification)>,`
`41`	`42`	`}`
`42`	`43`
`@@ -131,9 +132,10 @@ impl Display for Error {`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`impl Cfg {`
`134`		`- pub fn new(root_directory: PathBuf, notify_handler: Box<Fn(Notification)>) -> Self {`
	`135`	`+ pub fn new(root_directory: PathBuf, dist_server: &str, notify_handler: Box<Fn(Notification)>) -> Self {`
`135`	`136`	`Cfg {`
`136`	`137`	`root_directory: root_directory,`
	`138`	`+ dist_server: dist_server.to_owned(),`
`137`	`139`	`notify_handler: notify_handler,`
`138`	`140`	`}`
`139`	`141`	`}`