Skip to content

Commit

Permalink
Convert most code to new inner attribute syntax.
Browse files Browse the repository at this point in the history
Closes #2569
  • Loading branch information
brson authored and alexcrichton committed Mar 29, 2014
1 parent c6bbb95 commit 451e8c1
Show file tree
Hide file tree
Showing 327 changed files with 646 additions and 643 deletions.
8 changes: 4 additions & 4 deletions src/compiletest/compiletest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#[crate_type = "bin"];
#[feature(phase)];
#![crate_type = "bin"]
#![feature(phase)]

#[allow(non_camel_case_types)];
#[deny(warnings)];
#![allow(non_camel_case_types)]
#![deny(warnings)]

extern crate test;
extern crate getopts;
Expand Down
18 changes: 9 additions & 9 deletions src/libarena/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
//! of individual objects while the arena itself is still alive. The benefit
//! of an arena is very fast allocation; just a pointer bump.

#[crate_id = "arena#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];
#[allow(missing_doc)];
#[feature(managed_boxes)];
#![crate_id = "arena#0.10-pre"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![license = "MIT/ASL2"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]
#![allow(missing_doc)]
#![feature(managed_boxes)]

extern crate collections;

Expand Down
2 changes: 1 addition & 1 deletion src/libcollections/bitv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#[allow(missing_doc)];
#![allow(missing_doc)]


use std::cmp;
Expand Down
16 changes: 8 additions & 8 deletions src/libcollections/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
* Collection types.
*/

#[crate_id = "collections#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];
#![crate_id = "collections#0.10-pre"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![license = "MIT/ASL2"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]

#[feature(macro_rules, managed_boxes, default_type_params, phase)];
#![feature(macro_rules, managed_boxes, default_type_params, phase)]

extern crate rand;

Expand Down
2 changes: 1 addition & 1 deletion src/libcollections/priority_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

//! A priority queue implemented with a binary heap

#[allow(missing_doc)];
#![allow(missing_doc)]

use std::clone::Clone;
use std::mem::{move_val_init, init, replace, swap};
Expand Down
2 changes: 1 addition & 1 deletion src/libcollections/smallintmap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* are O(highest integer key).
*/

#[allow(missing_doc)];
#![allow(missing_doc)]

use std::iter::{Enumerate, FilterMap, Rev};
use std::mem::replace;
Expand Down
18 changes: 9 additions & 9 deletions src/libflate/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ Simple compression
*/

#[crate_id = "flate#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];
#[feature(phase)];
#[deny(deprecated_owned_vector)];
#![crate_id = "flate#0.10-pre"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![license = "MIT/ASL2"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]
#![feature(phase)]
#![deny(deprecated_owned_vector)]

#[cfg(test)] #[phase(syntax, link)] extern crate log;

Expand Down
20 changes: 10 additions & 10 deletions src/libfourcc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ fn main() {
*/

#[crate_id = "fourcc#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];

#[deny(deprecated_owned_vector)];
#[feature(macro_registrar, managed_boxes)];
#![crate_id = "fourcc#0.10-pre"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![license = "MIT/ASL2"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]

#![deny(deprecated_owned_vector)]
#![feature(macro_registrar, managed_boxes)]

extern crate syntax;

Expand Down
20 changes: 10 additions & 10 deletions src/libgetopts/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@
//! }
//! ~~~

#[crate_id = "getopts#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];
#[feature(globs, phase)];
#[deny(missing_doc)];
#[deny(deprecated_owned_vector)];
#![crate_id = "getopts#0.10-pre"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![license = "MIT/ASL2"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]
#![feature(globs, phase)]
#![deny(missing_doc)]
#![deny(deprecated_owned_vector)]

#[cfg(test)] #[phase(syntax, link)] extern crate log;

Expand Down
14 changes: 7 additions & 7 deletions src/libglob/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
* `glob`/`fnmatch` functions.
*/

#[crate_id = "glob#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];
#![crate_id = "glob#0.10-pre"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![license = "MIT/ASL2"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]

use std::cell::Cell;
use std::{cmp, os, path};
Expand Down
18 changes: 9 additions & 9 deletions src/libgreen/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,17 @@
//! pool.shutdown();
//! ```

#[crate_id = "green#0.10-pre"];
#[license = "MIT/ASL2"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];
#![crate_id = "green#0.10-pre"]
#![license = "MIT/ASL2"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]

// NB this does *not* include globs, please keep it that way.
#[feature(macro_rules, phase)];
#[allow(visible_private_types)];
#![feature(macro_rules, phase)]
#![allow(visible_private_types)]

#[cfg(test)] #[phase(syntax, link)] extern crate log;
#[cfg(test)] extern crate rustuv;
Expand Down
2 changes: 1 addition & 1 deletion src/libgreen/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// FIXME: this file probably shouldn't exist

#[macro_escape];
#![macro_escape]

use std::fmt;

Expand Down
20 changes: 10 additions & 10 deletions src/libhexfloat/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ fn main() {
*/

#[crate_id = "hexfloat#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];

#[deny(deprecated_owned_vector)];
#[feature(macro_registrar, managed_boxes)];
#![crate_id = "hexfloat#0.10-pre"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![license = "MIT/ASL2"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]

#![deny(deprecated_owned_vector)]
#![feature(macro_registrar, managed_boxes)]

extern crate syntax;

Expand Down
20 changes: 10 additions & 10 deletions src/liblog/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,16 @@ if logging is disabled, none of the components of the log will be executed.
*/

#[crate_id = "log#0.10-pre"];
#[license = "MIT/ASL2"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];

#[feature(macro_rules)];
#[deny(missing_doc, deprecated_owned_vector)];
#![crate_id = "log#0.10-pre"]
#![license = "MIT/ASL2"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]

#![feature(macro_rules)]
#![deny(missing_doc, deprecated_owned_vector)]

extern crate sync;

Expand Down
2 changes: 1 addition & 1 deletion src/liblog/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

//! Logging macros

#[macro_escape];
#![macro_escape]

/// The standard logging macro
///
Expand Down
18 changes: 9 additions & 9 deletions src/libnative/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
//! }
//! ```

#[crate_id = "native#0.10-pre"];
#[license = "MIT/ASL2"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];
#[deny(unused_result, unused_must_use)];
#[allow(non_camel_case_types)];
#![crate_id = "native#0.10-pre"]
#![license = "MIT/ASL2"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]
#![deny(unused_result, unused_must_use)]
#![allow(non_camel_case_types)]

// NB this crate explicitly does *not* allow glob imports, please seriously
// consider whether they're needed before adding that feature here (the
Expand Down
2 changes: 1 addition & 1 deletion src/libnum/complex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ impl<T: ToStrRadix + Num + Ord> ToStrRadix for Cmplx<T> {

#[cfg(test)]
mod test {
#[allow(non_uppercase_statics)];
#![allow(non_uppercase_statics)]

use super::{Complex64, Cmplx};
use std::num::{Zero,One,Float};
Expand Down
18 changes: 9 additions & 9 deletions src/libnum/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#[feature(macro_rules)];
#![feature(macro_rules)]

#[crate_id = "num#0.10-pre"];
#[crate_type = "rlib"];
#[crate_type = "dylib"];
#[license = "MIT/ASL2"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];
#![crate_id = "num#0.10-pre"]
#![crate_type = "rlib"]
#![crate_type = "dylib"]
#![license = "MIT/ASL2"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]

#[deny(deprecated_owned_vector)];
#![deny(deprecated_owned_vector)]

extern crate rand;

Expand Down
18 changes: 9 additions & 9 deletions src/librand/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ println!("{:?}", tuple_ptr)
```
*/

#[crate_id = "rand#0.10-pre"];
#[license = "MIT/ASL2"];
#[crate_type = "dylib"];
#[crate_type = "rlib"];
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")];

#[feature(macro_rules, managed_boxes, phase)];
#![crate_id = "rand#0.10-pre"]
#![license = "MIT/ASL2"]
#![crate_type = "dylib"]
#![crate_type = "rlib"]
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://static.rust-lang.org/doc/master")]

#![feature(macro_rules, managed_boxes, phase)]

#[cfg(test)]
#[phase(syntax, link)] extern crate log;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/back/target_strs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#[allow(non_camel_case_types)];
#![allow(non_camel_case_types)]

pub struct t {
module_asm: ~str,
Expand Down
4 changes: 2 additions & 2 deletions src/librustc/front/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

// Code that generates a test runner to run all the tests in a crate

#[allow(dead_code)];
#[allow(unused_imports)];
#![allow(dead_code)]
#![allow(unused_imports)]

use driver::session::Session;
use front::config;
Expand Down
Loading

5 comments on commit 451e8c1

@bors
Copy link
Contributor

@bors bors commented on 451e8c1 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at alexcrichton@451e8c1

@bors
Copy link
Contributor

@bors bors commented on 451e8c1 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/attr-syntax = 451e8c1 into auto

@bors
Copy link
Contributor

@bors bors commented on 451e8c1 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/attr-syntax = 451e8c1 merged ok, testing candidate = ff733c7

@bors
Copy link
Contributor

@bors bors commented on 451e8c1 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 451e8c1 Mar 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = ff733c7

Please sign in to comment.