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.

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

Fix clippy warnings #64942

Merged
merged 1 commit into from
Oct 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/libarena/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ impl DroplessArena {
// though it was supposed to give us `len`
return slice::from_raw_parts_mut(mem, i);
}
ptr::write(mem.offset(i as isize), value.unwrap());
ptr::write(mem.add(i), value.unwrap());
i += 1;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_apfloat/ieee.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1199,8 +1199,8 @@ impl<S: Semantics> Float for IeeeFloat<S> {
}

// Handle a leading minus sign.
let minus = s.starts_with("-");
if minus || s.starts_with("+") {
let minus = s.starts_with('-');
if minus || s.starts_with('+') {
JohnTitor marked this conversation as resolved.
Show resolved Hide resolved
s = &s[1..];
if s.is_empty() {
return Err(ParseError("String has no digits"));
Expand Down
4 changes: 2 additions & 2 deletions src/librustc_data_structures/graph/implementation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,11 @@ pub struct AdjacentEdges<'g, N, E> {

impl<'g, N: Debug, E: Debug> AdjacentEdges<'g, N, E> {
fn targets(self) -> impl Iterator<Item = NodeIndex> + 'g {
self.into_iter().map(|(_, edge)| edge.target)
self.map(|(_, edge)| edge.target)
}

fn sources(self) -> impl Iterator<Item = NodeIndex> + 'g {
self.into_iter().map(|(_, edge)| edge.source)
self.map(|(_, edge)| edge.source)
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_index/bit_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ impl<'a, T: Idx> Iterator for HybridIter<'a, T> {

fn next(&mut self) -> Option<T> {
match self {
HybridIter::Sparse(sparse) => sparse.next().map(|e| *e),
HybridIter::Sparse(sparse) => sparse.next().copied(),
HybridIter::Dense(dense) => dense.next(),
}
}
Expand Down
21 changes: 10 additions & 11 deletions src/libserialize/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1053,12 +1053,12 @@ impl Json {
/// a value associated with the provided key is found. If no value is found
/// or the Json value is not an Object, returns `None`.
pub fn search(&self, key: &str) -> Option<&Json> {
match self {
&Json::Object(ref map) => {
match *self {
Json::Object(ref map) => {
match map.get(key) {
Some(json_value) => Some(json_value),
None => {
for (_, v) in map {
for v in map.values() {
match v.search(key) {
x if x.is_some() => return x,
_ => ()
Expand Down Expand Up @@ -1487,12 +1487,12 @@ impl<T: Iterator<Item=char>> Parser<T> {
}

fn parse_number(&mut self) -> JsonEvent {
let mut neg = false;

if self.ch_is('-') {
let neg = if self.ch_is('-') {
self.bump();
neg = true;
}
true
} else {
false
};

let res = match self.parse_u64() {
Ok(res) => res,
Expand Down Expand Up @@ -2162,10 +2162,9 @@ impl crate::Decoder for Decoder {
let s = self.read_str()?;
{
let mut it = s.chars();
match (it.next(), it.next()) {
if let (Some(c), None) = (it.next(), it.next()) {
// exactly one character
(Some(c), None) => return Ok(c),
_ => ()
return Ok(c);
}
}
Err(ExpectedError("single character string".to_owned(), s.to_string()))
Expand Down