about summary refs log tree commit diff
path: root/src/liblog/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-10-10 00:07:08 +0000
committerbors <bors@rust-lang.org>2014-10-10 00:07:08 +0000
commitf9fc49c06e5c71a8d63d6120e1a92b6445fb501d (patch)
tree8a7c52db87b4ff8d5a7fa97dc44fb9ac10b92626 /src/liblog/lib.rs
parent8b12fb326b50c40c7b5acadb4403c7021fedb272 (diff)
parent0b517117b3ac9c4981bbe00a529e48e4019554d1 (diff)
downloadrust-f9fc49c06e5c71a8d63d6120e1a92b6445fb501d.tar.gz
rust-f9fc49c06e5c71a8d63d6120e1a92b6445fb501d.zip
auto merge of #17853 : alexcrichton/rust/issue-17718, r=pcwalton
This change is an implementation of [RFC 69][rfc] which adds a third kind of
global to the language, `const`. This global is most similar to what the old
`static` was, and if you're unsure about what to use then you should use a
`const`.

The semantics of these three kinds of globals are:

* A `const` does not represent a memory location, but only a value. Constants
  are translated as rvalues, which means that their values are directly inlined
  at usage location (similar to a #define in C/C++). Constant values are, well,
  constant, and can not be modified. Any "modification" is actually a
  modification to a local value on the stack rather than the actual constant
  itself.

  Almost all values are allowed inside constants, whether they have interior
  mutability or not. There are a few minor restrictions listed in the RFC, but
  they should in general not come up too often.

* A `static` now always represents a memory location (unconditionally). Any
  references to the same `static` are actually a reference to the same memory
  location. Only values whose types ascribe to `Sync` are allowed in a `static`.
  This restriction is in place because many threads may access a `static`
  concurrently. Lifting this restriction (and allowing unsafe access) is a
  future extension not implemented at this time.

* A `static mut` continues to always represent a memory location. All references
  to a `static mut` continue to be `unsafe`.

This is a large breaking change, and many programs will need to be updated
accordingly. A summary of the breaking changes is:

* Statics may no longer be used in patterns. Statics now always represent a
  memory location, which can sometimes be modified. To fix code, repurpose the
  matched-on-`static` to a `const`.

      static FOO: uint = 4;
      match n {
          FOO => { /* ... */ }
          _ => { /* ... */ }
      }

  change this code to:

      const FOO: uint = 4;
      match n {
          FOO => { /* ... */ }
          _ => { /* ... */ }
      }

* Statics may no longer refer to other statics by value. Due to statics being
  able to change at runtime, allowing them to reference one another could
  possibly lead to confusing semantics. If you are in this situation, use a
  constant initializer instead. Note, however, that statics may reference other
  statics by address, however.

* Statics may no longer be used in constant expressions, such as array lengths.
  This is due to the same restrictions as listed above. Use a `const` instead.

[breaking-change]
Closes #17718 

[rfc]: https://github.com/rust-lang/rfcs/pull/246
Diffstat (limited to 'src/liblog/lib.rs')
-rw-r--r--src/liblog/lib.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs
index 4c0406eedf2..b08ad3b6c61 100644
--- a/src/liblog/lib.rs
+++ b/src/liblog/lib.rs
@@ -188,10 +188,10 @@ mod directive;
 
 /// Maximum logging level of a module that can be specified. Common logging
 /// levels are found in the DEBUG/INFO/WARN/ERROR constants.
-pub static MAX_LOG_LEVEL: u32 = 255;
+pub const MAX_LOG_LEVEL: u32 = 255;
 
 /// The default logging level of a crate if no other is specified.
-static DEFAULT_LOG_LEVEL: u32 = 1;
+const DEFAULT_LOG_LEVEL: u32 = 1;
 
 /// An unsafe constant that is the maximum logging level of any module
 /// specified. This is the first line of defense to determining whether a
@@ -205,13 +205,13 @@ static mut DIRECTIVES: *const Vec<directive::LogDirective> =
 static mut FILTER: *const Regex = 0 as *const _;
 
 /// Debug log level
-pub static DEBUG: u32 = 4;
+pub const DEBUG: u32 = 4;
 /// Info log level
-pub static INFO: u32 = 3;
+pub const INFO: u32 = 3;
 /// Warn log level
-pub static WARN: u32 = 2;
+pub const WARN: u32 = 2;
 /// Error log level
-pub static ERROR: u32 = 1;
+pub const ERROR: u32 = 1;
 
 local_data_key!(local_logger: Box<Logger + Send>)