Skip to content

Commit 348cc94

Browse files
sfacklersfackler
committed
Remove special casing for some meta attributes
Descriptions and licenses are handled by Cargo now, so there's no reason to keep these attributes around.
1 parent 930f877 commit 348cc94

File tree

28 files changed

+3
-50
lines changed

28 files changed

+3
-50
lines changed

‎src/doc/reference.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -777,13 +777,8 @@ metadata that influences the behavior of the compiler.
777777

778778
```{.rust}
779779
# #![allow(unused_attribute)]
780-
// Crate ID
781-
#![crate_id = "projx#2.5"]
782-
783-
// Additional metadata attributes
784-
#![desc = "Project X"]
785-
#![license = "BSD"]
786-
#![comment = "This is a comment on Project X."]
780+
// Crate name
781+
#![crate_name = "projx"]
787782
788783
// Specify the output type
789784
#![crate_type = "lib"]
@@ -1961,7 +1956,7 @@ An example of attributes:
19611956

19621957
```{.rust}
19631958
// General metadata applied to the enclosing module or crate.
1964-
#![license = "BSD"]
1959+
#![crate_type = "lib"]
19651960
19661961
// A function marked as a unit test
19671962
#[test]

‎src/liballoc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
5959
#![crate_name = "alloc"]
6060
#![experimental]
61-
#![license = "MIT/ASL2"]
6261
#![crate_type = "rlib"]
6362
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
6463
html_favicon_url = "http://www.rust-lang.org/favicon.ico",

‎src/libarena/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#![experimental]
2424
#![crate_type = "rlib"]
2525
#![crate_type = "dylib"]
26-
#![license = "MIT/ASL2"]
2726
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2827
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2928
html_root_url = "http://doc.rust-lang.org/nightly/")]

‎src/libcollections/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#![crate_name = "collections"]
1717
#![experimental]
1818
#![crate_type = "rlib"]
19-
#![license = "MIT/ASL2"]
2019
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2120
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2221
html_root_url = "http://doc.rust-lang.org/nightly/",

‎src/libcore/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949

5050
#![crate_name = "core"]
5151
#![experimental]
52-
#![license = "MIT/ASL2"]
5352
#![crate_type = "rlib"]
5453
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
5554
html_favicon_url = "http://www.rust-lang.org/favicon.ico",

‎src/libflate/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
2222
#![experimental]
2323
#![crate_type = "rlib"]
2424
#![crate_type = "dylib"]
25-
#![license = "MIT/ASL2"]
2625
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2726
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2827
html_root_url = "http://doc.rust-lang.org/nightly/")]

‎src/libfmt_macros/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
1717
#![crate_name = "fmt_macros"]
1818
#![experimental]
19-
#![license = "MIT/ASL2"]
2019
#![crate_type = "rlib"]
2120
#![crate_type = "dylib"]
2221
#![feature(macro_rules, globs, import_shadowing)]

‎src/libgetopts/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
#![experimental]
8383
#![crate_type = "rlib"]
8484
#![crate_type = "dylib"]
85-
#![license = "MIT/ASL2"]
8685
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
8786
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
8887
html_root_url = "http://doc.rust-lang.org/nightly/",

‎src/libgraphviz/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ pub fn main() {
267267
#![experimental]
268268
#![crate_type = "rlib"]
269269
#![crate_type = "dylib"]
270-
#![license = "MIT/ASL2"]
271270
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
272271
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
273272
html_root_url = "http://doc.rust-lang.org/nightly/")]

‎src/liblog/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@
159159
160160
#![crate_name = "log"]
161161
#![experimental]
162-
#![license = "MIT/ASL2"]
163162
#![crate_type = "rlib"]
164163
#![crate_type = "dylib"]
165164
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/librand/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
//! interface through `std::rand`.
1818
1919
#![crate_name = "rand"]
20-
#![license = "MIT/ASL2"]
2120
#![crate_type = "rlib"]
2221
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
2322
html_favicon_url = "http://www.rust-lang.org/favicon.ico",

‎src/librbml/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#![experimental]
2020
#![crate_type = "rlib"]
2121
#![crate_type = "dylib"]
22-
#![license = "MIT/ASL2"]
2322
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2423
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2524
html_root_url = "http://doc.rust-lang.org/nightly/",

‎src/libregex/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@
363363
#![crate_type = "rlib"]
364364
#![crate_type = "dylib"]
365365
#![experimental]
366-
#![license = "MIT/ASL2"]
367366
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
368367
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
369368
html_root_url = "http://doc.rust-lang.org/nightly/",

‎src/libregex_macros/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![crate_name = "regex_macros"]
1515
#![crate_type = "dylib"]
1616
#![experimental]
17-
#![license = "MIT/ASL2"]
1817
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
1918
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2019
html_root_url = "http://doc.rust-lang.org/nightly/")]

‎src/librustc/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ This API is completely unstable and subject to change.
2020

2121
#![crate_name = "rustc"]
2222
#![experimental]
23-
#![comment = "The Rust compiler"]
24-
#![license = "MIT/ASL2"]
2523
#![crate_type = "dylib"]
2624
#![crate_type = "rlib"]
2725
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/librustc/lint/builtin.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -635,11 +635,6 @@ impl LintPass for UnusedAttributes {
635635
// used in resolve
636636
"prelude_import",
637637

638-
// not used anywhere (!?) but apparently we want to keep them around
639-
"comment",
640-
"desc",
641-
"license",
642-
643638
// FIXME: #14407 these are only looked at on-demand so we can't
644639
// guarantee they'll have already been checked
645640
"deprecated",
@@ -658,10 +653,6 @@ impl LintPass for UnusedAttributes {
658653
"no_start",
659654
"no_main",
660655
"no_std",
661-
"desc",
662-
"comment",
663-
"license",
664-
"copyright",
665656
"no_builtins",
666657
];
667658

‎src/librustc_back/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
2424
#![crate_name = "rustc_back"]
2525
#![experimental]
26-
#![comment = "The Rust compiler minimal-dependency dumping-ground"]
27-
#![license = "MIT/ASL2"]
2826
#![crate_type = "dylib"]
2927
#![crate_type = "rlib"]
3028
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/librustc_llvm/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#![crate_name = "rustc_llvm"]
1717
#![experimental]
18-
#![license = "MIT/ASL2"]
1918
#![crate_type = "dylib"]
2019
#![crate_type = "rlib"]
2120
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/librustc_trans/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ This API is completely unstable and subject to change.
2020

2121
#![crate_name = "rustc_trans"]
2222
#![experimental]
23-
#![comment = "The Rust compiler back end and driver"]
24-
#![license = "MIT/ASL2"]
2523
#![crate_type = "dylib"]
2624
#![crate_type = "rlib"]
2725
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/librustdoc/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
#![crate_name = "rustdoc"]
1212
#![experimental]
13-
#![desc = "rustdoc, the Rust documentation extractor"]
14-
#![license = "MIT/ASL2"]
1513
#![crate_type = "dylib"]
1614
#![crate_type = "rlib"]
1715

‎src/librustrt/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
#![crate_name = "rustrt"]
12-
#![license = "MIT/ASL2"]
1312
#![crate_type = "rlib"]
1413
#![crate_type = "dylib"]
1514
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/libserialize/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Core encoding and decoding interfaces.
1818
#![experimental]
1919
#![crate_type = "rlib"]
2020
#![crate_type = "dylib"]
21-
#![license = "MIT/ASL2"]
2221
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2322
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2423
html_root_url = "http://doc.rust-lang.org/nightly/",

‎src/libstd/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@
9696
9797
#![crate_name = "std"]
9898
#![unstable]
99-
#![comment = "The Rust standard library"]
100-
#![license = "MIT/ASL2"]
10199
#![crate_type = "rlib"]
102100
#![crate_type = "dylib"]
103101
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/libsyntax/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
1717
#![crate_name = "syntax"]
1818
#![experimental]
19-
#![license = "MIT/ASL2"]
2019
#![crate_type = "dylib"]
2120
#![crate_type = "rlib"]
2221
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/libterm/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
4141
#![crate_name = "term"]
4242
#![experimental]
43-
#![comment = "Simple ANSI color library"]
44-
#![license = "MIT/ASL2"]
4543
#![crate_type = "rlib"]
4644
#![crate_type = "dylib"]
4745
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/libtest/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525

2626
#![crate_name = "test"]
2727
#![experimental]
28-
#![comment = "Rust internal test library only used by rustc"]
29-
#![license = "MIT/ASL2"]
3028
#![crate_type = "rlib"]
3129
#![crate_type = "dylib"]
3230
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

‎src/libtime/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#![crate_type = "rlib"]
1818
#![crate_type = "dylib"]
19-
#![license = "MIT/ASL2"]
2019
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2120
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2221
html_root_url = "http://doc.rust-lang.org/nightly/",

‎src/libunicode/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
2323
#![crate_name = "unicode"]
2424
#![experimental]
25-
#![license = "MIT/ASL2"]
2625
#![crate_type = "rlib"]
2726
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2827
html_favicon_url = "http://www.rust-lang.org/favicon.ico",

0 commit comments

Comments
 (0)