Skip to content

Commit e4931ea

Browse files
committedNov 6, 2019
Auto merge of #66141 - Centril:rollup-n2fcvp9, r=Centril
Rollup of 11 pull requests Successful merges: - #65892 (Remove `PartialEq` and `Eq` from the `SpecialDerives`.) - #66014 (Show type parameter name and definition in type mismatch error messages ) - #66027 (Move has_panic_handler to query) - #66054 (syntax: Avoid span arithmetic for delimiter tokens) - #66068 (use silent emitter for rustdoc highlighting pass) - #66081 (let caller of check_ptr_access_align control the error message) - #66093 (Do not ICE with a precision flag in formatting str and no format arguments) - #66098 (Detect `::` -> `:` typo when involving turbofish) - #66101 (Tweak type mismatch caused by break on tail expr) - #66106 (Fix typo in explanation of `E0080`) - #66115 (rustc: remove "GlobalMetaData" dead code from hir::map::definitions.) Failed merges: r? @ghost
2 parents 1423bec + 35a5ffc commit e4931ea

File tree

96 files changed

+453
-466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+453
-466
lines changed
 

‎src/librustc/error_codes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ This works because `Box` is a pointer, so its size is well-known.
335335
"##,
336336

337337
E0080: r##"
338-
This error indicates that the compiler was unable to sensibly evaluate an
338+
This error indicates that the compiler was unable to sensibly evaluate a
339339
constant expression that had to be evaluated. Attempting to divide by 0
340340
or causing integer overflow are two ways to induce this error. For example:
341341

‎src/librustc/hir/lowering.rs

-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ use syntax::ast;
6565
use syntax::ptr::P as AstP;
6666
use syntax::ast::*;
6767
use syntax::errors;
68-
use syntax::expand::SpecialDerives;
6968
use syntax::print::pprust;
7069
use syntax::parse::token::{self, Nonterminal, Token};
7170
use syntax::tokenstream::{TokenStream, TokenTree};
@@ -184,8 +183,6 @@ pub trait Resolver {
184183
ns: Namespace,
185184
) -> (ast::Path, Res<NodeId>);
186185

187-
fn has_derives(&self, node_id: NodeId, derives: SpecialDerives) -> bool;
188-
189186
fn lint_buffer(&mut self) -> &mut lint::LintBuffer;
190187
}
191188

0 commit comments

Comments
 (0)
Please sign in to comment.