Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more clippy fixes #70229

Merged
merged 7 commits into from
Mar 22, 2020
Merged

more clippy fixes #70229

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
54e103b
don't convert results to options just for matching (clippy::if_let_so…
matthiaskrgr Mar 21, 2020
1dcbdbd
use let instead of match for matches with single bindings (clippy::ma…
matthiaskrgr Mar 21, 2020
5566a1c
remove redundant returns (clippy::needless_return)
matthiaskrgr Mar 21, 2020
3b4c2f6
don't redundantly repeat field names (clippy::redundant_field_names)
matthiaskrgr Mar 21, 2020
a6692b7
clarify when we pass () to functions (clippy::unit_arg)
matthiaskrgr Mar 21, 2020
47e9775
make some let-if-bindings more idiomatic (clippy::useless_let_if_seq)
matthiaskrgr Mar 21, 2020
e45fdcf
remove unused unit values (clippy::unused_unit)
matthiaskrgr Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/librustc_span/source_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,11 @@ impl SourceMap {
pub fn doctest_offset_line(&self, file: &FileName, orig: usize) -> usize {
match file {
FileName::DocTest(_, offset) => {
return if *offset >= 0 {
orig + *offset as usize
} else {
if *offset < 0 {
orig - (-(*offset)) as usize
};
} else {
orig + *offset as usize
}
Mark-Simulacrum marked this conversation as resolved.
Show resolved Hide resolved
}
_ => orig,
}
Expand Down
4 changes: 1 addition & 3 deletions src/librustdoc/theme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,7 @@ pub fn load_css_paths(v: &[u8]) -> CssPath {
}

pub fn get_differences(against: &CssPath, other: &CssPath, v: &mut Vec<String>) {
if against.name != other.name {
return;
} else {
if against.name == other.name {
for child in &against.children {
let mut found = false;
let mut found_working = false;
Expand Down