diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/hir/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_passes/ast_validation.rs | 2 | ||||
| -rw-r--r-- | src/librustc_save_analysis/dump_visitor.rs | 6 | ||||
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ast.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/test.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax_ext/proc_macro_registrar.rs | 10 |
8 files changed, 15 insertions, 18 deletions
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index 09fc824750d..5984f8ce5b1 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -568,7 +568,7 @@ impl Generics { /// Synthetic Type Parameters are converted to an other form during lowering, this allows /// to track the original form they had. Useful for error messages. -#[derive(Copy, Clone, PartialEq, RustcEncodable, RustcDecodable, Hash, Debug)] +#[derive(Copy, Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)] pub enum SyntheticTyParamKind { ImplTrait } diff --git a/src/librustc_passes/ast_validation.rs b/src/librustc_passes/ast_validation.rs index 4a9d3e6a114..f27ca444672 100644 --- a/src/librustc_passes/ast_validation.rs +++ b/src/librustc_passes/ast_validation.rs @@ -68,7 +68,7 @@ impl<'a> AstValidator<'a> { vis.span, E0449, "unnecessary visibility qualifier"); - if vis.node.is_public() { + if vis.node.is_pub() { err.span_label(vis.span, "`pub` not permitted here because it's implied"); } if let Some(note) = note { diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs index e0de60556a2..34dcdfb757f 100644 --- a/src/librustc_save_analysis/dump_visitor.rs +++ b/src/librustc_save_analysis/dump_visitor.rs @@ -65,14 +65,14 @@ macro_rules! down_cast_data { macro_rules! access_from { ($save_ctxt:expr, $vis:expr, $id:expr) => { Access { - public: $vis.node.is_public(), + public: $vis.node.is_pub(), reachable: $save_ctxt.analysis.access_levels.is_reachable($id), } }; ($save_ctxt:expr, $item:expr) => { Access { - public: $item.vis.node.is_public(), + public: $item.vis.node.is_pub(), reachable: $save_ctxt.analysis.access_levels.is_reachable($item.id), } }; @@ -523,7 +523,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> { .iter() .enumerate() .filter_map(|(i, f)| { - if include_priv_fields || f.vis.node.is_public() { + if include_priv_fields || f.vis.node.is_pub() { f.ident .map(|i| i.to_string()) .or_else(|| Some(i.to_string())) diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index de9c8370cdb..030b36c2212 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1855,7 +1855,7 @@ impl<'tcx> Clean<Type> for ty::ProjectionTy<'tcx> { } } -#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Debug, Hash)] +#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Eq, Debug, Hash)] pub enum GenericParamDefKind { Lifetime, Type { @@ -1866,8 +1866,6 @@ pub enum GenericParamDefKind { }, } -impl Eq for GenericParamDefKind {} - #[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Eq, Debug, Hash)] pub struct GenericParamDef { pub name: String, diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index a7ce4404fb8..209e0b6d787 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1581,7 +1581,8 @@ impl TyKind { pub fn is_implicit_self(&self) -> bool { if let TyKind::ImplicitSelf = *self { true } else { false } } - pub(crate) fn is_empty_tuple(&self) -> bool { + + crate fn is_unit(&self) -> bool { if let TyKind::Tup(ref tys) = *self { tys.is_empty() } else { false } } } @@ -1982,7 +1983,7 @@ pub enum VisibilityKind { } impl VisibilityKind { - pub fn is_public(&self) -> bool { + pub fn is_pub(&self) -> bool { if let VisibilityKind::Public = *self { true } else { false } } } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8bd4a7d71d7..62bb5fbd04f 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -6999,7 +6999,7 @@ impl<'a> Parser<'a> { // Verify whether we have encountered a struct or method definition where the user forgot to // add the `struct` or `fn` keyword after writing `pub`: `pub S {}` - if visibility.node.is_public() && + if visibility.node.is_pub() && self.check_ident() && self.look_ahead(1, |t| *t != token::Not) { diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs index b4e1dd75b3b..d8b8d13a38c 100644 --- a/src/libsyntax/test.rs +++ b/src/libsyntax/test.rs @@ -353,7 +353,7 @@ fn is_test_fn(cx: &TestCtxt, i: &ast::Item) -> bool { // type implements the `Termination` trait as `libtest` enforces that. let has_output = match decl.output { ast::FunctionRetTy::Default(..) => false, - ast::FunctionRetTy::Ty(ref t) if t.node.is_empty_tuple() => false, + ast::FunctionRetTy::Ty(ref t) if t.node.is_unit() => false, _ => true }; diff --git a/src/libsyntax_ext/proc_macro_registrar.rs b/src/libsyntax_ext/proc_macro_registrar.rs index 5cbd9782575..2522fa769c5 100644 --- a/src/libsyntax_ext/proc_macro_registrar.rs +++ b/src/libsyntax_ext/proc_macro_registrar.rs @@ -101,9 +101,7 @@ fn is_proc_macro_attr(attr: &ast::Attribute) -> bool { impl<'a> CollectProcMacros<'a> { fn check_not_pub_in_root(&self, vis: &ast::Visibility, sp: Span) { - if self.is_proc_macro_crate && - self.in_root && - vis.node.is_public() { + if self.is_proc_macro_crate && self.in_root && vis.node.is_pub() { self.handler.span_err(sp, "`proc-macro` crate types cannot \ export any items other than functions \ @@ -181,7 +179,7 @@ impl<'a> CollectProcMacros<'a> { Vec::new() }; - if self.in_root && item.vis.node.is_public() { + if self.in_root && item.vis.node.is_pub() { self.derives.push(ProcMacroDerive { span: item.span, trait_name, @@ -206,7 +204,7 @@ impl<'a> CollectProcMacros<'a> { return; } - if self.in_root && item.vis.node.is_public() { + if self.in_root && item.vis.node.is_pub() { self.attr_macros.push(ProcMacroDef { span: item.span, function_name: item.ident, @@ -229,7 +227,7 @@ impl<'a> CollectProcMacros<'a> { return; } - if self.in_root && item.vis.node.is_public() { + if self.in_root && item.vis.node.is_pub() { self.bang_macros.push(ProcMacroDef { span: item.span, function_name: item.ident, |