From c4474ab905f5b81b481a69454afc029af64fb1ed Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Sat, 2 Sep 2017 01:59:54 -0400 Subject: [PATCH 1/8] stabilize mem::discriminant (closes #24263) --- src/libcore/mem.rs | 17 ++++++++--------- src/librustc/lib.rs | 2 -- src/librustc_data_structures/lib.rs | 1 - src/librustc_metadata/lib.rs | 1 - src/test/run-pass/discriminant_value-wrapper.rs | 2 -- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index 4b866cab1eae2..ab39c3cfc3538 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -754,39 +754,39 @@ pub unsafe fn transmute_copy(src: &T) -> U { /// Opaque type representing the discriminant of an enum. /// /// See the `discriminant` function in this module for more information. -#[unstable(feature = "discriminant_value", reason = "recently added, follows RFC", issue = "24263")] +#[stable(feature = "discriminant_value", since = "1.22.0")] pub struct Discriminant(u64, PhantomData<*const T>); // N.B. These trait implementations cannot be derived because we don't want any bounds on T. -#[unstable(feature = "discriminant_value", reason = "recently added, follows RFC", issue = "24263")] +#[stable(feature = "discriminant_value", since = "1.22.0")] impl Copy for Discriminant {} -#[unstable(feature = "discriminant_value", reason = "recently added, follows RFC", issue = "24263")] +#[stable(feature = "discriminant_value", since = "1.22.0")] impl clone::Clone for Discriminant { fn clone(&self) -> Self { *self } } -#[unstable(feature = "discriminant_value", reason = "recently added, follows RFC", issue = "24263")] +#[stable(feature = "discriminant_value", since = "1.22.0")] impl cmp::PartialEq for Discriminant { fn eq(&self, rhs: &Self) -> bool { self.0 == rhs.0 } } -#[unstable(feature = "discriminant_value", reason = "recently added, follows RFC", issue = "24263")] +#[stable(feature = "discriminant_value", since = "1.22.0")] impl cmp::Eq for Discriminant {} -#[unstable(feature = "discriminant_value", reason = "recently added, follows RFC", issue = "24263")] +#[stable(feature = "discriminant_value", since = "1.22.0")] impl hash::Hash for Discriminant { fn hash(&self, state: &mut H) { self.0.hash(state); } } -#[unstable(feature = "discriminant_value", reason = "recently added, follows RFC", issue = "24263")] +#[stable(feature = "discriminant_value", since = "1.22.0")] impl fmt::Debug for Discriminant { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt.debug_tuple("Discriminant") @@ -811,7 +811,6 @@ impl fmt::Debug for Discriminant { /// the actual data: /// /// ``` -/// #![feature(discriminant_value)] /// use std::mem; /// /// enum Foo { A(&'static str), B(i32), C(i32) } @@ -820,7 +819,7 @@ impl fmt::Debug for Discriminant { /// assert!(mem::discriminant(&Foo::B(1)) == mem::discriminant(&Foo::B(2))); /// assert!(mem::discriminant(&Foo::B(3)) != mem::discriminant(&Foo::C(3))); /// ``` -#[unstable(feature = "discriminant_value", reason = "recently added, follows RFC", issue = "24263")] +#[stable(feature = "discriminant_value", since = "1.22.0")] pub fn discriminant(v: &T) -> Discriminant { unsafe { Discriminant(intrinsics::discriminant_value(v), PhantomData) diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index 152b2e2aa5ebc..82f01c36fee7f 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -24,7 +24,6 @@ #![feature(conservative_impl_trait)] #![feature(const_fn)] #![feature(core_intrinsics)] -#![feature(discriminant_value)] #![feature(i128_type)] #![cfg_attr(windows, feature(libc))] #![feature(never_type)] @@ -34,7 +33,6 @@ #![feature(slice_patterns)] #![feature(specialization)] #![feature(unboxed_closures)] -#![feature(discriminant_value)] #![feature(trace_macros)] #![feature(test)] diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs index da00ebc4b9ee9..47061883425e2 100644 --- a/src/librustc_data_structures/lib.rs +++ b/src/librustc_data_structures/lib.rs @@ -29,7 +29,6 @@ #![feature(unsize)] #![feature(i128_type)] #![feature(conservative_impl_trait)] -#![feature(discriminant_value)] #![feature(specialization)] #![cfg_attr(unix, feature(libc))] diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs index f79abecf9da4b..f4e6f57c43777 100644 --- a/src/librustc_metadata/lib.rs +++ b/src/librustc_metadata/lib.rs @@ -21,7 +21,6 @@ #![feature(quote)] #![feature(rustc_diagnostic_macros)] #![feature(specialization)] -#![feature(discriminant_value)] #![feature(rustc_private)] #[macro_use] diff --git a/src/test/run-pass/discriminant_value-wrapper.rs b/src/test/run-pass/discriminant_value-wrapper.rs index 2dbda0be18d98..d7a32423710fd 100644 --- a/src/test/run-pass/discriminant_value-wrapper.rs +++ b/src/test/run-pass/discriminant_value-wrapper.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(discriminant_value)] - use std::mem; enum ADT { From 0df9c5450bddf3c18cdf56a9fb28e5c7c07c6450 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 5 Sep 2017 14:19:22 -0700 Subject: [PATCH 2/8] Include rustc in the default `./x.py install` The default install used to include rustc, rust-std, and rust-docs, but the refactoring in commit 6b3413d825fa6 make rustc only default in extended builds. This commit makes rustc installed by default again. --- src/bootstrap/install.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index 89690e444d1f6..608924c9c28d1 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -200,7 +200,7 @@ install!((self, builder, _config), builder.ensure(dist::Src); install_src(builder, self.stage); }, ONLY_BUILD; - Rustc, "src/librustc", _config.extended, only_hosts: true, { + Rustc, "src/librustc", true, only_hosts: true, { builder.ensure(dist::Rustc { compiler: builder.compiler(self.stage, self.target), }); From 27e18d3c5083859a3798107ad89eebe9306843b3 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 6 Sep 2017 22:47:56 -0700 Subject: [PATCH 3/8] Rotate Travis/AppVeyor S3 keys Haven't done this in awhile so seems like a good idea! --- .travis.yml | 16 ++++++++-------- appveyor.yml | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index d315546930330..23bae6d9f1721 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,9 +125,9 @@ matrix: env: global: - SCCACHE_BUCKET=rust-lang-ci-sccache - - AWS_ACCESS_KEY_ID=AKIAIMX7VLAS3PZAVLUQ + - AWS_ACCESS_KEY_ID=AKIAJAMV3QAMMA6AXHFQ # AWS_SECRET_ACCESS_KEY=... - - secure: "Pixhh0hXDqGCdOyLtGFjli3J2AtDWIpyb2btIrLe956nCBDRutRoMm6rv5DI9sFZN07Mms7VzNNvhc9wCW1y63JAm414d2Co7Ob8kWMZlz9l9t7ACHuktUiis8yr+S4Quq1Vqd6pqi7pf2J++UxC8R/uLeqVrubzr6+X7AbmEFE=" + - secure: "j96XxTVOSUf4s4r4htIxn/fvIa5DWbMgLqWl7r8z2QfgUwscmkMXAwXuFNc7s7bGTpV/+CgDiMFFM6BAFLGKutytIF6oA02s9b+usQYnM0th7YQ2AIgm9GtMTJCJp4AoyfFmh8F2faUICBZlfVLUJ34udHEe35vOklix+0k4WDo=" before_install: # If we are building a pull request, do the build if $ALLOW_PR == 1 @@ -260,9 +260,9 @@ deploy: upload_dir: rustc-builds acl: public_read region: us-east-1 - access_key_id: AKIAIPQVNYF2T3DTYIWQ + access_key_id: AKIAJVBODR3IA4O72THQ secret_access_key: - secure: "FBqDqOTeIPMu6v/WYPf4CFSlh9rLRZGKVtpLa5KkyuOhXRTrnEzBduEtS8/FMIxdQImvurhSvxWvqRybMOi4qoVfjMqqpHAI7uBbidbrvAcJoHNsx6BgUNVCIoH6a0UsAjTUtm6/YPIpzbHoLZXPL0GrHPMk6Mu04qVSmcYNWn4=" + secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0=" on: branch: auto condition: $DEPLOY = 1 @@ -274,9 +274,9 @@ deploy: upload_dir: rustc-builds-try acl: public_read region: us-east-1 - access_key_id: AKIAIPQVNYF2T3DTYIWQ + access_key_id: AKIAJVBODR3IA4O72THQ secret_access_key: - secure: "FBqDqOTeIPMu6v/WYPf4CFSlh9rLRZGKVtpLa5KkyuOhXRTrnEzBduEtS8/FMIxdQImvurhSvxWvqRybMOi4qoVfjMqqpHAI7uBbidbrvAcJoHNsx6BgUNVCIoH6a0UsAjTUtm6/YPIpzbHoLZXPL0GrHPMk6Mu04qVSmcYNWn4=" + secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0=" on: branch: try condition: $DEPLOY = 1 && $ALLOW_TRY = 1 @@ -290,9 +290,9 @@ deploy: upload_dir: rustc-builds-alt acl: public_read region: us-east-1 - access_key_id: AKIAIPQVNYF2T3DTYIWQ + access_key_id: AKIAJVBODR3IA4O72THQ secret_access_key: - secure: "FBqDqOTeIPMu6v/WYPf4CFSlh9rLRZGKVtpLa5KkyuOhXRTrnEzBduEtS8/FMIxdQImvurhSvxWvqRybMOi4qoVfjMqqpHAI7uBbidbrvAcJoHNsx6BgUNVCIoH6a0UsAjTUtm6/YPIpzbHoLZXPL0GrHPMk6Mu04qVSmcYNWn4=" + secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0=" on: branch: auto condition: $DEPLOY_ALT = 1 diff --git a/appveyor.yml b/appveyor.yml index f548d6694c80f..62b62ae7c42e9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ environment: SCCACHE_BUCKET: rust-lang-ci-sccache - AWS_ACCESS_KEY_ID: AKIAIMX7VLAS3PZAVLUQ + AWS_ACCESS_KEY_ID: AKIAJAMV3QAMMA6AXHFQ AWS_SECRET_ACCESS_KEY: - secure: 1UkmbiDd15tWtYbMm5O2Uqm0b0Ur8v1MoSlydxl4ojcroPeerRMlUges0l57py8c + secure: 7Y+JiquYedOAgnUU26uL0DPzrxmTtR+qIwG6rNKSuWDffqU3vVZxbGXim9QpTO80 SCCACHE_DIGEST: f808afabb4a4eb1d7112bcb3fa6be03b61e93412890c88e177c667eb37f46353d7ec294e559b16f9f4b5e894f2185fe7670a0df15fd064889ecbd80f0c34166c # By default schannel checks revocation of certificates unlike some other SSL @@ -185,9 +185,9 @@ before_deploy: deploy: - provider: S3 skip_cleanup: true - access_key_id: AKIAIPQVNYF2T3DTYIWQ + access_key_id: AKIAJVBODR3IA4O72THQ secret_access_key: - secure: +11jsUNFTQ9dq5Ad1i2+PeUJaXluFJ0zIJAXESE1dFT3Kdjku4/eDdgyjgsB6GnV + secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt bucket: rust-lang-ci set_public: true region: us-east-1 @@ -202,9 +202,9 @@ deploy: # different upload directory and a slightly different trigger - provider: S3 skip_cleanup: true - access_key_id: AKIAIPQVNYF2T3DTYIWQ + access_key_id: AKIAJVBODR3IA4O72THQ secret_access_key: - secure: +11jsUNFTQ9dq5Ad1i2+PeUJaXluFJ0zIJAXESE1dFT3Kdjku4/eDdgyjgsB6GnV + secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt bucket: rust-lang-ci set_public: true region: us-east-1 From 65bf0e2862d10c52432db1753c400f3a04723ea3 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 7 Sep 2017 13:48:35 -0700 Subject: [PATCH 4/8] travis: Downgrade to previous images temporarily Travis is in the process of [rolling out an update][update] but looks like our tests are breaking, let's temporarily roll back to get the queue moving again. [update]: https://blog.travis-ci.com/2017-08-29-trusty-image-updates --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 23bae6d9f1721..827f5fd159ae3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: shell sudo: required dist: trusty +# FIXME(#44398) shouldn't need to be here +group: deprecated-2017Q3 services: - docker From 214abf211b7edd3588d4072bdb438f134a856d9e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 13 Sep 2017 07:41:58 -0700 Subject: [PATCH 5/8] rustc: Spawn `cmd /c emcc.bat` explicitly In #42436 the behavior for spawning processes on Windows was tweaked slightly to fix various bugs, but this caused #42791 as a regression, namely that to spawn batch scripts they need to be manually spawned with `cmd /c` instead now. This updates the compiler to handle this case explicitly for Emscripten. Closes #42791 --- src/librustc_trans/back/link.rs | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index 4e211d83cff3e..5de48fbce9da9 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -106,14 +106,32 @@ pub fn build_link_meta(incremental_hashes_map: &IncrementalHashesMap) -> LinkMet pub fn get_linker(sess: &Session) -> (String, Command, Vec<(OsString, OsString)>) { let envs = vec![("PATH".into(), command_path(sess))]; + // If our linker looks like a batch script on Windows then to execute this + // we'll need to spawn `cmd` explicitly. This is primarily done to handle + // emscripten where the linker is `emcc.bat` and needs to be spawned as + // `cmd /c emcc.bat ...`. + // + // This worked historically but is needed manually since #42436 (regression + // was tagged as #42791) and some more info can be found on #44443 for + // emscripten itself. + let cmd = |linker: &str| { + if cfg!(windows) && linker.ends_with(".bat") { + let mut cmd = Command::new("cmd"); + cmd.arg("/c").arg(linker); + cmd + } else { + Command::new(linker) + } + }; + if let Some(ref linker) = sess.opts.cg.linker { - (linker.clone(), Command::new(linker), envs) + (linker.clone(), cmd(linker), envs) } else if sess.target.target.options.is_like_msvc { let (cmd, envs) = msvc_link_exe_cmd(sess); ("link.exe".to_string(), cmd, envs) } else { let linker = &sess.target.target.options.linker; - (linker.clone(), Command::new(&linker), envs) + (linker.clone(), cmd(linker), envs) } } From 6c6a2c12bae8133b02d7ce1bef153ccbed7067d7 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Wed, 13 Sep 2017 17:29:55 -0400 Subject: [PATCH 6/8] update "since" for discriminant_value It's going to be backported to beta. --- src/libcore/mem.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index ab39c3cfc3538..5dc6a94e1833d 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -754,39 +754,39 @@ pub unsafe fn transmute_copy(src: &T) -> U { /// Opaque type representing the discriminant of an enum. /// /// See the `discriminant` function in this module for more information. -#[stable(feature = "discriminant_value", since = "1.22.0")] +#[stable(feature = "discriminant_value", since = "1.21.0")] pub struct Discriminant(u64, PhantomData<*const T>); // N.B. These trait implementations cannot be derived because we don't want any bounds on T. -#[stable(feature = "discriminant_value", since = "1.22.0")] +#[stable(feature = "discriminant_value", since = "1.21.0")] impl Copy for Discriminant {} -#[stable(feature = "discriminant_value", since = "1.22.0")] +#[stable(feature = "discriminant_value", since = "1.21.0")] impl clone::Clone for Discriminant { fn clone(&self) -> Self { *self } } -#[stable(feature = "discriminant_value", since = "1.22.0")] +#[stable(feature = "discriminant_value", since = "1.21.0")] impl cmp::PartialEq for Discriminant { fn eq(&self, rhs: &Self) -> bool { self.0 == rhs.0 } } -#[stable(feature = "discriminant_value", since = "1.22.0")] +#[stable(feature = "discriminant_value", since = "1.21.0")] impl cmp::Eq for Discriminant {} -#[stable(feature = "discriminant_value", since = "1.22.0")] +#[stable(feature = "discriminant_value", since = "1.21.0")] impl hash::Hash for Discriminant { fn hash(&self, state: &mut H) { self.0.hash(state); } } -#[stable(feature = "discriminant_value", since = "1.22.0")] +#[stable(feature = "discriminant_value", since = "1.21.0")] impl fmt::Debug for Discriminant { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt.debug_tuple("Discriminant") @@ -819,7 +819,7 @@ impl fmt::Debug for Discriminant { /// assert!(mem::discriminant(&Foo::B(1)) == mem::discriminant(&Foo::B(2))); /// assert!(mem::discriminant(&Foo::B(3)) != mem::discriminant(&Foo::C(3))); /// ``` -#[stable(feature = "discriminant_value", since = "1.22.0")] +#[stable(feature = "discriminant_value", since = "1.21.0")] pub fn discriminant(v: &T) -> Discriminant { unsafe { Discriminant(intrinsics::discriminant_value(v), PhantomData) From 45b426c82af225c4db2135df84116c2c30c9a46d Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Wed, 6 Sep 2017 08:28:15 +1200 Subject: [PATCH 7/8] Attempt to fix the component manifest problem for rls-preview cc #44270 --- src/bootstrap/dist.rs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index bfcfb5f9a37f8..65a59d78d7c5f 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1081,8 +1081,14 @@ impl Step for Rls { .arg("--output-dir").arg(&distdir(build)) .arg("--non-installed-overlay").arg(&overlay) .arg(format!("--package-name={}-{}", name, target)) - .arg("--component-name=rls") .arg("--legacy-manifest-dirs=rustlib,cargo"); + + if build.config.channel == "nightly" { + cmd.arg("--component-name=rls"); + } else { + cmd.arg("--component-name=rls-preview"); + } + build.run(&mut cmd); distdir(build).join(format!("{}-{}.tar.gz", name, target)) } @@ -1279,9 +1285,12 @@ impl Step for Extended { cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target)) .join(format!("rust-std-{}", target)), &exe.join("rust-std")); - cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target)) - .join("rls"), - &exe.join("rls")); + let rls_path = if build.config.channel == "nightly" { + work.join(&format!("{}-{}", pkgname(build, "rls"), target)).join("rls") + } else { + work.join(&format!("{}-{}", pkgname(build, "rls"), target)).join("rls-preview") + }; + cp_r(&rls_path, &exe.join("rls")); cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-analysis"), target)) .join(format!("rust-analysis-{}", target)), &exe.join("rust-analysis")); From 25676e01518b1a33bc395d659dcd2ea89a817c64 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 14 Sep 2017 10:35:59 -0700 Subject: [PATCH 8/8] Bump beta to .3 --- src/bootstrap/channel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index d6ce3eb98ecb7..0c22cc2f6c439 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -29,7 +29,7 @@ pub const CFG_RELEASE_NUM: &str = "1.21.0"; // An optional number to put after the label, e.g. '.2' -> '-beta.2' // Be sure to make this starts with a dot to conform to semver pre-release // versions (section 9) -pub const CFG_PRERELEASE_VERSION: &str = ".2"; +pub const CFG_PRERELEASE_VERSION: &str = ".3"; pub struct GitInfo { inner: Option,