hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update ruby/extractor/src/main.rs

Browse Source 
Co-authored-by: Nick Rolfe <nickrolfe@github.com>
This commit is contained in:
Arthur Baars
2022-07-22 13:36:22 +02:00
committed by GitHub
parent 1399610bd4
commit d44bf326f0
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruby/extractor/src/main.rs
View File

@@ -48,17 +48,13 @@ lazy_static! {
}
fn encoding_from_name(encoding_name: &str) -> Option<&(dyn encoding::Encoding + Send + Sync)> {
match encoding::label::encoding_from_whatwg_label(&encoding_name) {
Some(e) => return Some(e),
None => {
if let Some(cap) = CP_NUMBER.captures(&encoding_name) {
return encoding::label::encoding_from_windows_code_page(
str::parse(cap.get(1).unwrap().as_str()).unwrap(),
);
} else {
return None;
}
}
match encoding::label::encoding_from_whatwg_label(encoding_name) {
s @ Some(_) => s,
None => CP_NUMBER.captures(encoding_name).and_then(|cap| {
encoding::label::encoding_from_windows_code_page(
str::parse(cap.get(1).unwrap().as_str()).unwrap(),
)
}),
}
}