Skip to content

Commit

Permalink
Auto merge of rust-lang#40455 - frewsxcv:rollup, r=frewsxcv
Browse files Browse the repository at this point in the history
Rollup of 5 pull requests

- Successful merges: rust-lang#40369, rust-lang#40390, rust-lang#40426, rust-lang#40449, rust-lang#40453
- Failed merges:
  • Loading branch information
bors committed Mar 12, 2017
2 parents f88b24b + 3b002a8 commit 0066869
Show file tree
Hide file tree
Showing 21 changed files with 356 additions and 135 deletions.
80 changes: 40 additions & 40 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions src/libproc_macro/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
#![crate_type = "dylib"]
#![deny(warnings)]
#![deny(missing_docs)]
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
html_root_url = "https://doc.rust-lang.org/nightly/",
html_playground_url = "https://play.rust-lang.org/",
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
test(no_crate_inject, attr(deny(warnings))),
test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))]

#![feature(rustc_private)]
#![feature(staged_api)]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_driver/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ Available lint options:
Allow <foo>
-D <foo> Deny <foo>
-F <foo> Forbid <foo> \
(deny, and deny all overrides)
(deny <foo> and all attempts to override)
");

Expand Down
Loading

0 comments on commit 0066869

Please sign in to comment.