diff options
| author | bors <bors@rust-lang.org> | 2020-01-12 02:28:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-12 02:28:48 +0000 |
| commit | 0b6c116a84fb1dbb60b5870291f5d7df808c280d (patch) | |
| tree | 22efe869664863f74b929dcb29f0b28ad2ce25e6 /src/librustc_plugin_impl | |
| parent | f363745872f9b45cfec575f3c2cac42f0c242c03 (diff) | |
| parent | 82c19b4388dc671dd4c1224b8577a5e23ff315e4 (diff) | |
| download | rust-0b6c116a84fb1dbb60b5870291f5d7df808c280d.tar.gz rust-0b6c116a84fb1dbb60b5870291f5d7df808c280d.zip | |
Auto merge of #68142 - Centril:rollup-dl232e9, r=Centril
Rollup of 6 pull requests Successful merges: - #67494 (Constify more of alloc::Layout) - #67867 (Correctly check for opaque types in `assoc_ty_def`) - #67948 (Galloping search for binary_search_util) - #68045 (Move more of `rustc::lint` into `rustc_lint`) - #68089 (Unstabilize `Vec::remove_item`) - #68108 (Add suggestions when encountering chained comparisons) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_plugin_impl')
| -rw-r--r-- | src/librustc_plugin_impl/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/librustc_plugin_impl/lib.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_plugin_impl/Cargo.toml b/src/librustc_plugin_impl/Cargo.toml index d0b7accafd6..41e6c699c34 100644 --- a/src/librustc_plugin_impl/Cargo.toml +++ b/src/librustc_plugin_impl/Cargo.toml @@ -14,6 +14,7 @@ doctest = false rustc = { path = "../librustc" } rustc_errors = { path = "../librustc_errors" } rustc_hir = { path = "../librustc_hir" } +rustc_lint = { path = "../librustc_lint" } rustc_metadata = { path = "../librustc_metadata" } syntax = { path = "../libsyntax" } rustc_span = { path = "../librustc_span" } diff --git a/src/librustc_plugin_impl/lib.rs b/src/librustc_plugin_impl/lib.rs index 682d223f565..10712eb60b9 100644 --- a/src/librustc_plugin_impl/lib.rs +++ b/src/librustc_plugin_impl/lib.rs @@ -9,7 +9,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(nll)] -use rustc::lint::LintStore; +use rustc_lint::LintStore; pub mod build; pub mod load; |