diff options
| author | bors <bors@rust-lang.org> | 2015-11-18 19:49:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-18 19:49:33 +0000 |
| commit | 22e31f10c22112b486f4999f90e4ba9c7e23b9b6 (patch) | |
| tree | 28e9ca0bf181ccff4f1e5fa6e929c1c714df9ce7 /src/libstd/macros.rs | |
| parent | 3c68f646e957065fe5fabd4af850abaa8c4ee0af (diff) | |
| parent | 64b90f81c3ec2cf5564ed8456d836516491b9d01 (diff) | |
| download | rust-22e31f10c22112b486f4999f90e4ba9c7e23b9b6.tar.gz rust-22e31f10c22112b486f4999f90e4ba9c7e23b9b6.zip | |
Auto merge of #29083 - petrochenkov:stability3, r=alexcrichton
What this patch does: - Stability annotations are now based on "exported items" supplied by rustc_privacy and not "public items". Exported items are as accessible for external crates as directly public items and should be annotated with stability attributes. - Trait impls require annotations now. - Reexports require annotations now. - Crates themselves didn't require annotations, now they do. - Exported macros are annotated now, but these annotations are not used yet. - Some useless annotations are detected and result in errors - Finally, some small bugs are fixed - deprecation propagates from stable deprecated parents, items in blocks are traversed correctly (fixes https://github.com/rust-lang/rust/issues/29034) + some code cleanup.
Diffstat (limited to 'src/libstd/macros.rs')
| -rw-r--r-- | src/libstd/macros.rs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index a88ddb997f6..efeb59b4ac7 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -259,6 +259,7 @@ pub mod builtin { /// assert_eq!(s, format!("hello {}", "world")); /// /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! format_args { ($fmt:expr, $($args:tt)*) => ({ /* compiler built-in */ @@ -279,6 +280,7 @@ pub mod builtin { /// let path: &'static str = env!("PATH"); /// println!("the $PATH variable at the time of compiling was: {}", path); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! env { ($name:expr) => ({ /* compiler built-in */ }) } @@ -298,6 +300,7 @@ pub mod builtin { /// let key: Option<&'static str> = option_env!("SECRET_KEY"); /// println!("the secret key might be: {:?}", key); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! option_env { ($name:expr) => ({ /* compiler built-in */ }) } @@ -322,6 +325,7 @@ pub mod builtin { /// println!("{}", f()); /// # } /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! concat_idents { ($($e:ident),*) => ({ /* compiler built-in */ }) @@ -342,6 +346,7 @@ pub mod builtin { /// let s = concat!("test", 10, 'b', true); /// assert_eq!(s, "test10btrue"); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! concat { ($($e:expr),*) => ({ /* compiler built-in */ }) } @@ -357,6 +362,7 @@ pub mod builtin { /// let current_line = line!(); /// println!("defined on line: {}", current_line); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! line { () => ({ /* compiler built-in */ }) } @@ -372,6 +378,7 @@ pub mod builtin { /// let current_col = column!(); /// println!("defined on column: {}", current_col); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! column { () => ({ /* compiler built-in */ }) } @@ -388,6 +395,7 @@ pub mod builtin { /// let this_file = file!(); /// println!("defined in file: {}", this_file); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! file { () => ({ /* compiler built-in */ }) } @@ -403,6 +411,7 @@ pub mod builtin { /// let one_plus_one = stringify!(1 + 1); /// assert_eq!(one_plus_one, "1 + 1"); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! stringify { ($t:tt) => ({ /* compiler built-in */ }) } @@ -417,6 +426,7 @@ pub mod builtin { /// ```rust,ignore /// let secret_key = include_str!("secret-key.ascii"); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! include_str { ($file:expr) => ({ /* compiler built-in */ }) } @@ -431,6 +441,7 @@ pub mod builtin { /// ```rust,ignore /// let secret_key = include_bytes!("secret-key.bin"); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! include_bytes { ($file:expr) => ({ /* compiler built-in */ }) } @@ -451,6 +462,7 @@ pub mod builtin { /// /// test::foo(); /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! module_path { () => ({ /* compiler built-in */ }) } @@ -472,6 +484,7 @@ pub mod builtin { /// "unix-directory" /// }; /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! cfg { ($cfg:tt) => ({ /* compiler built-in */ }) } @@ -486,6 +499,7 @@ pub mod builtin { /// include!("/path/to/a/file") /// } /// ``` + #[stable(feature = "rust1", since = "1.0.0")] #[macro_export] macro_rules! include { ($cfg:tt) => ({ /* compiler built-in */ }) } } |
