Skip to content

Commit 1db971c

Browse files
committed
Eliminate build warnings
1 parent bf86e2c commit 1db971c

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

src/ringo/molecule/smiles/reader/atom.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ pub(crate) fn parse_atom(input: &str) -> IResult<&str, Atom> {
1111
let mut isotope: Option<u8> = None;
1212
let mut charge: Option<i8> = None;
1313
let mut hs: Option<u8> = None;
14-
let mut atomic_number = 0;
15-
14+
let atomic_number: u8;
1615
let (mut input, sqro_found) = opt(nom::character::complete::char('['))(input)?;
1716
if sqro_found.is_some() {
1817
(input, isotope) = opt(parse_isotope)(input).unwrap_or((input, None));
@@ -21,7 +20,7 @@ pub(crate) fn parse_atom(input: &str) -> IResult<&str, Atom> {
2120
if sqro_found.is_some() {
2221
(input, hs) = opt(parse_hydrogens)(input).unwrap_or((input, None));
2322
(input, charge) = opt(parse_charge)(input).unwrap_or((input, None));
24-
let mut sqrc_found: Option<char> = None;
23+
let sqrc_found: Option<char>;
2524
(input, sqrc_found) = opt(nom::character::complete::char(']'))(input)?;
2625
if (sqro_found.is_some() && sqrc_found.is_none())
2726
|| (sqro_found.is_none() && sqrc_found.is_some())

src/ringo/ringo/fingerprint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ mod tests {
4242
fp.0.set(17, true);
4343

4444
let mut buf = vec![0u8; FINGERPRINT_SIZE / 8];
45-
let encoded = bincode::encode_into_slice(&fp, buf.as_mut_slice(), bincode::config::standard()).unwrap();
45+
bincode::encode_into_slice(&fp, buf.as_mut_slice(), bincode::config::standard()).unwrap();
4646

4747
let decoded: Fingerprint =
4848
bincode::decode_from_slice(&buf, bincode::config::standard())

src/ringo/ringo/index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn index(smiles_file: &str) {
1616

1717
// open binary file for index
1818
let mut offset = 0;
19-
let mut fo = File::create(smiles_file.to_owned() + ".fp");
19+
let fo = File::create(smiles_file.to_owned() + ".fp");
2020
let mut writer = BufWriter::new(fo.unwrap());
2121

2222
for line in std::io::BufReader::new(fi).lines() {

src/ringo/ringo/search.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ pub fn similarity_search(smiles_file: &str, query: &str, min_similarity: f32, li
2525
let mut buf_reader = BufReader::new(fif);
2626

2727
let mut results = Vec::new();
28-
29-
for i in 0..index_count {
28+
29+
for _ in 0..index_count {
3030
// read index item from file
3131
let mut buf = vec![0u8; index_item_size as usize];
3232
buf_reader.read_exact(&mut buf).unwrap();
@@ -49,16 +49,23 @@ pub fn similarity_search(smiles_file: &str, query: &str, min_similarity: f32, li
4949
line: line,
5050
similarity: similarity
5151
});
52+
53+
if results.len() >= limit {
54+
break;
55+
}
5256
}
5357
}
54-
58+
5559
results
5660
}
5761

5862
#[test]
5963
fn test_similarity_search() {
6064
let results = similarity_search("molecules.smi", "CC(C)CC1=CC=C(C=C1)C(C)C(=O)O", 0.7, 100);
6165
assert_eq!(results.len(), 1);
66+
assert!(results[0].line.starts_with("CC(C)CC1=CC=C(C=C1)C(C)C(=O)O"));
67+
assert_eq!(results[0].similarity, 1.0);
6268
let results = similarity_search("molecules.smi", "CC(C)CC1=CC=C(C=C1)C(C)C(=O)O", 0.5, 100);
6369
assert_eq!(results.len(), 2);
70+
6471
}

0 commit comments

Comments
 (0)