Skip to content

Commit 31533d9

Browse files
committed
Fix correct default weight in media_type_propose
1 parent 56f2223 commit 31533d9

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/content/accept.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,9 @@ mod test {
362362
let mut accept = Accept::from_headers(headers)?.unwrap();
363363
accept.sort();
364364
let mut accept = accept.iter();
365+
assert_eq!(accept.next().unwrap(), mime::XML);
365366
assert_eq!(accept.next().unwrap(), mime::PLAIN);
366367
assert_eq!(accept.next().unwrap(), mime::HTML);
367-
assert_eq!(accept.next().unwrap(), mime::XML);
368368
Ok(())
369369
}
370370

@@ -381,9 +381,9 @@ mod test {
381381
let mut accept = Accept::from_headers(res)?.unwrap();
382382
accept.sort();
383383
let mut accept = accept.iter();
384-
assert_eq!(accept.next().unwrap(), mime::PLAIN);
385384
assert_eq!(accept.next().unwrap(), mime::XML);
386385
assert_eq!(accept.next().unwrap(), mime::HTML);
386+
assert_eq!(accept.next().unwrap(), mime::PLAIN);
387387
Ok(())
388388
}
389389

@@ -394,7 +394,7 @@ mod test {
394394
accept.push(MediaTypeProposal::new(mime::PLAIN, Some(0.8))?);
395395
accept.push(MediaTypeProposal::new(mime::XML, None)?);
396396

397-
assert_eq!(accept.negotiate(&[mime::HTML, mime::XML])?, mime::HTML);
397+
assert_eq!(accept.negotiate(&[mime::HTML, mime::XML])?, mime::XML);
398398
Ok(())
399399
}
400400

src/content/media_type_proposal.rs

+6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ impl MediaTypeProposal {
2929
"MediaTypeProposal should have a weight between 0.0 and 1.0"
3030
)
3131
}
32+
if weight.is_none() {
33+
return Ok(Self {
34+
media_type: media_type.into(),
35+
weight: Some(1.0),
36+
});
37+
}
3238

3339
Ok(Self {
3440
media_type: media_type.into(),

0 commit comments

Comments
 (0)