diff options
| author | kennytm <kennytm@gmail.com> | 2018-07-14 02:56:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-14 02:56:44 +0800 |
| commit | e1452fa71fc19f10e46a312ca7fbf0228d0aa378 (patch) | |
| tree | b08caa053b179744412dbdd1bb777de9e6e76318 | |
| parent | 9f79e915ff91c974dc47bfc8bb8be34efb7ce30e (diff) | |
| parent | 0d7b2e6e28dbaada91aac03964b345036894967a (diff) | |
| download | rust-e1452fa71fc19f10e46a312ca7fbf0228d0aa378.tar.gz rust-e1452fa71fc19f10e46a312ca7fbf0228d0aa378.zip | |
Rollup merge of #52290 - ljedrz:dyn_librustc_save_analysis, r=cramertj
Deny bare trait objects in src/librustc_save_analysis Enforce `#![deny(bare_trait_objects)]` in `src/librustc_save_analysis`.
| -rw-r--r-- | src/librustc_save_analysis/json_dumper.rs | 4 | ||||
| -rw-r--r-- | src/librustc_save_analysis/lib.rs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/librustc_save_analysis/json_dumper.rs b/src/librustc_save_analysis/json_dumper.rs index 1b09df16a7d..2fe7d73de8a 100644 --- a/src/librustc_save_analysis/json_dumper.rs +++ b/src/librustc_save_analysis/json_dumper.rs @@ -46,7 +46,7 @@ impl<'b, W: Write> DumpOutput for WriteOutput<'b, W> { } pub struct CallbackOutput<'b> { - callback: &'b mut FnMut(&Analysis), + callback: &'b mut dyn FnMut(&Analysis), } impl<'b> DumpOutput for CallbackOutput<'b> { @@ -67,7 +67,7 @@ impl<'b, W: Write> JsonDumper<WriteOutput<'b, W>> { impl<'b> JsonDumper<CallbackOutput<'b>> { pub fn with_callback( - callback: &'b mut FnMut(&Analysis), + callback: &'b mut dyn FnMut(&Analysis), config: Config, ) -> JsonDumper<CallbackOutput<'b>> { JsonDumper { diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs index 447b5f1fe47..055fbb236d8 100644 --- a/src/librustc_save_analysis/lib.rs +++ b/src/librustc_save_analysis/lib.rs @@ -13,6 +13,7 @@ html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(custom_attribute)] #![allow(unused_attributes)] +#![deny(bare_trait_objects)] #![recursion_limit="256"] @@ -1088,7 +1089,7 @@ impl<'a> SaveHandler for DumpHandler<'a> { /// Call a callback with the results of save-analysis. pub struct CallbackHandler<'b> { - pub callback: &'b mut FnMut(&rls_data::Analysis), + pub callback: &'b mut dyn FnMut(&rls_data::Analysis), } impl<'b> SaveHandler for CallbackHandler<'b> { |