Removed STATIC & STATIC_REF from Qualif flags.

Author: Alexander Regueiro

src/librustc_mir/transform/promote_consts.rs

@@ -384,9 +384,8 @@ impl<'a, 'tcx> MutVisitor<'tcx> for Promoter<'a, 'tcx> {
                    local: &mut Local,
                    _: PlaceContext<'tcx>,
                    _: Location) {
-        if self.source.local_kind(*local) == LocalKind::Temp {
-            *local = self.promote_temp(*local);
-        }
+        assert_eq!(self.source.local_kind(*local), LocalKind::Temp);
+        *local = self.promote_temp(*local);
     }
 }
 

src/librustc_mir/transform/qualify_consts.rs

@@ -43,8 +43,7 @@ use super::promote_consts::{self, Candidate, TempState};
 
 bitflags! {
     // Borrows of temporaries can be promoted only if
-    // they have none of these qualifications, with
-    // the exception of `STATIC_REF` (in statics only).
+    // they have none of these qualifications.
     struct Qualif: u8 {
         // Constant containing interior mutability (UnsafeCell).
         const MUTABLE_INTERIOR  = 1 << 0;

src/test/compile-fail/const-fn-not-safe-for-const.rs

@@ -28,12 +28,11 @@ static Y: u32 = 0;
 
 const fn get_Y() -> u32 {
     Y
-        //~^ ERROR E0013
+    //~^ ERROR E0013
 }
 
 const fn get_Y_addr() -> &'static u32 {
     &Y
-        //~^ ERROR E0013
 }
 
 const fn get() -> u32 {

src/test/run-pass/static-by-reference.rs

@@ -0,0 +1,19 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+struct Foo {
+    a: u32
+}
+
+static S : Foo = Foo { a : 0 };
+static A : &'static u32 = &S.a;
+
+fn main() {
+}

src/test/run-pass/static-by-value.rs

@@ -0,0 +1,16 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![allow(warnings)]
+
+static A: u32 = 0;
+static B: u32 = A;
+
+fn main() {}

src/test/ui/issue-17718-const-bad-values.rs

@@ -13,8 +13,7 @@ const C1: &'static mut [usize] = &mut [];
 
 static mut S: usize = 3;
 const C2: &'static mut usize = unsafe { &mut S };
-//~^ ERROR: constants cannot refer to statics
-//~| ERROR: references in constants may only refer to immutable values
+//~^ ERROR: references in constants may only refer to immutable values
 //~| ERROR: references in constants may only refer to immutable values
 
 fn main() {}