Split up files with // ignore-tidy-filelength

library/core/src/str/indices.rs

@@ -1,3 +1,4 @@
+///! A module for working with iterators and string slices.
 use crate::iter::FusedIterator;
 use crate::str::Chars;
 

library/core/src/str/mod.rs

@@ -20,17 +20,13 @@ use crate::ops::Try;
 use crate::option;
 use crate::slice::{self, SliceIndex, Split as SliceSplit};
 
-#[allow(missing_docs)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub mod utf8;
 
-#[allow(missing_docs)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub mod indices;
 
-#[stable(feature = "rust1", since = "1.0.0")]
 pub use indices::CharIndices;
-#[stable(feature = "rust1", since = "1.0.0")]
 pub use utf8::Utf8Error;
 
 pub mod pattern;

library/core/src/str/utf8.rs

@@ -1,3 +1,5 @@
+///! A module for working with Utf8 errors
+
 /// Errors which can occur when attempting to interpret a sequence of [`u8`]
 /// as a string.
 ///
@@ -37,7 +39,6 @@
 ///     }
 /// }
 /// ```
-
 #[derive(Copy, Eq, PartialEq, Clone, Debug)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct Utf8Error {

src/librustc_resolve/diagnostics.rs

@@ -19,11 +19,12 @@ use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::{BytePos, MultiSpan, Span};
 use tracing::debug;
 
-use crate::binding_error::BindingError;
 use crate::imports::{Import, ImportKind, ImportResolver};
 use crate::path_names_to_string;
 use crate::{AmbiguityError, AmbiguityErrorMisc, AmbiguityKind};
-use crate::{CrateLint, HasGenericParams, MacroRulesScope, Module, ModuleOrUniformRoot};
+use crate::{
+    BindingError, CrateLint, HasGenericParams, MacroRulesScope, Module, ModuleOrUniformRoot,
+};
 use crate::{NameBinding, NameBindingKind, PrivacyError, VisResolutionError};
 use crate::{ParentScope, PathResult, ResolutionError, Resolver, Scope, ScopeSet, Segment};
 

src/librustc_resolve/late.rs

@@ -7,8 +7,7 @@
 
 use RibKind::*;
 
-use crate::binding_error::BindingError;
-use crate::{path_names_to_string, CrateLint, LexicalScopeBinding};
+use crate::{path_names_to_string, BindingError, CrateLint, LexicalScopeBinding};
 use crate::{Module, ModuleOrUniformRoot, NameBindingKind, ParentScope, PathResult};
 use crate::{ResolutionError, Resolver, Segment, UseError};
 

src/librustc_resolve/lib.rs

@@ -56,7 +56,7 @@ use rustc_span::{Span, DUMMY_SP};
 
 use std::cell::{Cell, RefCell};
 use std::collections::BTreeSet;
-use std::{fmt, iter, ptr};
+use std::{cmp, fmt, iter, ptr};
 use tracing::debug;
 
 use diagnostics::{extend_span_to_previous_binding, find_span_of_binding_until_next_binding};
@@ -67,7 +67,6 @@ use macros::{MacroRulesBinding, MacroRulesScope};
 
 type Res = def::Res<NodeId>;
 
-mod binding_error;
 mod build_reduced_graph;
 mod check_unused;
 mod def_collector;
@@ -76,8 +75,6 @@ mod imports;
 mod late;
 mod macros;
 
-use binding_error::BindingError;
-
 enum Weak {
     Yes,
     No,
@@ -152,6 +149,32 @@ impl<'a> ParentScope<'a> {
     }
 }
 
+#[derive(Eq)]
+struct BindingError {
+    name: Symbol,
+    origin: BTreeSet<Span>,
+    target: BTreeSet<Span>,
+    could_be_path: bool,
+}
+
+impl PartialOrd for BindingError {
+    fn partial_cmp(&self, other: &BindingError) -> Option<cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl PartialEq for BindingError {
+    fn eq(&self, other: &BindingError) -> bool {
+        self.name == other.name
+    }
+}
+
+impl Ord for BindingError {
+    fn cmp(&self, other: &BindingError) -> cmp::Ordering {
+        self.name.cmp(&other.name)
+    }
+}
+
 enum ResolutionError<'a> {
     /// Error E0401: can't use type or const parameters from outer function.
     GenericParamsFromOuterFunction(Res, HasGenericParams),