Skip to content

Commit 18571da

Browse files
committed
Fix Tidy errors
1 parent b6135e4 commit 18571da

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/librustc_resolve/lib.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2839,7 +2839,8 @@ impl<'a> Resolver<'a> {
28392839
let item_span = path.ident[path.ident.len() - 1].span;
28402840
let (mod_prefix, mod_str) = if path.ident.len() == 1 {
28412841
(format!(""), format!("this scope"))
2842-
} else if path.ident.len() == 2 && path.ident[0].name == keywords::CrateRoot.name() {
2842+
} else if path.ident.len() == 2 &&
2843+
path.ident[0].name == keywords::CrateRoot.name() {
28432844
(format!(""), format!("the crate root"))
28442845
} else {
28452846
let mod_path = ResolvePath {
@@ -3176,7 +3177,8 @@ impl<'a> Resolver<'a> {
31763177
source : Some(id),
31773178
speculative : false,
31783179
};
3179-
let res = self.smart_resolve_path_fragment(id, None, &resolve_path, span, PathSource::TraitItem(ns));
3180+
let res = self.smart_resolve_path_fragment(id, None, &resolve_path,
3181+
span, PathSource::TraitItem(ns));
31803182
return Some(PathResolution::with_unresolved_segments(
31813183
res.base_def(), res.unresolved_segments() + path.ident.len() - qself.position - 1
31823184
));
@@ -3243,10 +3245,7 @@ impl<'a> Resolver<'a> {
32433245
path: &ResolvePath,
32443246
opt_ns: Option<Namespace>, // `None` indicates a module path
32453247
record_used: bool,
3246-
path_span: Span)//,
3247-
//node_id: Option<NodeId>) // None indicates that we don't care about linting
3248-
// `::module` paths
3249-
-> PathResult<'a> {
3248+
path_span: Span) -> PathResult<'a> {
32503249
let mut module = None;
32513250
let mut allow_super = true;
32523251

0 commit comments

Comments
 (0)