diff options
| author | bors <bors@rust-lang.org> | 2020-01-20 05:56:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-20 05:56:53 +0000 |
| commit | 900811e43047fc5593f39b0363373530b02c87e0 (patch) | |
| tree | 34bc5482693fb417276dbcb216eb14f82ad952a6 /src/libsyntax | |
| parent | 29b854fb741809c29764e33fc17c32ba9c6523ba (diff) | |
| parent | 0259c103853afe4b641a1a3f36ca7daa92c2b0e2 (diff) | |
| download | rust-900811e43047fc5593f39b0363373530b02c87e0.tar.gz rust-900811e43047fc5593f39b0363373530b02c87e0.zip | |
Auto merge of #68380 - Dylan-DPC:rollup-a7moqmr, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #68326 (rustdoc: Catch fatal errors when syntax highlighting) - #68335 (Remove real_drop_in_place) - #68353 (Remove `rustc_error_codes` deps except in `rustc_driver`) - #68357 (rustdoc: Fix handling of compile errors when running `rustdoc --test`) - #68365 (Clean up error codes) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/libsyntax/attr/builtin.rs | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml index 7d9f715e9fe..2e647d2a1e0 100644 --- a/src/libsyntax/Cargo.toml +++ b/src/libsyntax/Cargo.toml @@ -21,5 +21,4 @@ rustc_index = { path = "../librustc_index" } rustc_lexer = { path = "../librustc_lexer" } rustc_macros = { path = "../librustc_macros" } smallvec = { version = "1.0", features = ["union", "may_dangle"] } -rustc_error_codes = { path = "../librustc_error_codes" } rustc_session = { path = "../librustc_session" } diff --git a/src/libsyntax/attr/builtin.rs b/src/libsyntax/attr/builtin.rs index 70f4f47621a..6cfe4f2de1e 100644 --- a/src/libsyntax/attr/builtin.rs +++ b/src/libsyntax/attr/builtin.rs @@ -12,8 +12,6 @@ use rustc_span::hygiene::Transparency; use rustc_span::{symbol::sym, symbol::Symbol, Span}; use std::num::NonZeroU32; -use rustc_error_codes::*; - pub fn is_builtin_attr(attr: &Attribute) -> bool { attr.is_doc_comment() || attr.ident().filter(|ident| is_builtin_attr_name(ident.name)).is_some() } |