corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1953783 - Move rust-helper to Rust 2021. r=valentin,necko-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D241384
This commit is contained in:
Lars Eggert
2025-03-15 09:36:48 +00:00
parent 431fbd1bca
commit 5369c9fcf1
3 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netwerk/base/rust-helper/Cargo.toml
View File

@@ -1,5 +1,5 @@
[package]
edition = "2015"
edition = "2021"
name = "netwerk_helper"
version = "0.0.1"
authors = ["Jeff Hemphill <jthemphill@mozilla.com>"]

65
netwerk/base/rust-helper/src/lib.rs
View File

@@ -2,21 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
extern crate nserror;
use self::nserror::*;
use std::{
fs::File,
io::{self, BufRead},
net::Ipv4Addr,
};
extern crate nsstring;
use self::nsstring::{nsACString, nsCString};
extern crate thin_vec;
use self::thin_vec::ThinVec;
use std::fs::File;
use std::io::{self, BufRead};
use std::net::Ipv4Addr;
use nserror::*;
use nsstring::{nsACString, nsCString};
use thin_vec::ThinVec;
/// HTTP leading whitespace, defined in netwerk/protocol/http/nsHttp.h
static HTTP_LWS: &'static [u8] = &[' ' as u8, '\t' as u8];
static HTTP_LWS: &[u8] = b" \t";
/// Trim leading whitespace, trailing whitespace, and quality-value
/// from a token.
@@ -31,7 +28,7 @@ fn trim_token(token: &[u8]) -> &[u8] {
// remove "; q=..." if present
let rtrim = token[ltrim..]
.iter()
.take_while(|c| **c != (';' as u8) && HTTP_LWS.iter().all(|ws| ws != *c))
.take_while(|c| **c != b';' && HTTP_LWS.iter().all(|ws| ws != *c))
.count();
&token[ltrim..ltrim + rtrim]
@@ -49,9 +46,9 @@ fn trim_token(token: &[u8]) -> &[u8] {
///
/// passing: "en, ja, fr_CA"
/// returns: "en,ja;q=0.7,fr_CA;q=0.3"
pub extern "C" fn rust_prepare_accept_languages<'a, 'b>(
i_accept_languages: &'a nsACString,
o_accept_languages: &'b mut nsACString,
pub extern "C" fn rust_prepare_accept_languages(
i_accept_languages: &nsACString,
o_accept_languages: &mut nsACString,
) -> nsresult {
if i_accept_languages.is_empty() {
return NS_OK;
@@ -59,9 +56,9 @@ pub extern "C" fn rust_prepare_accept_languages<'a, 'b>(
let make_tokens = || {
i_accept_languages
.split(|c| *c == (',' as u8))
.map(|token| trim_token(token))
.filter(|token| token.len() != 0)
.split(|c| *c == b',')
.map(trim_token)
.filter(|token| !token.is_empty())
};
let n = make_tokens().count();
@@ -73,7 +70,7 @@ pub extern "C" fn rust_prepare_accept_languages<'a, 'b>(
}
let token_pos = o_accept_languages.len();
o_accept_languages.append(&i_token as &[u8]);
o_accept_languages.append(i_token as &[u8]);
{
let o_token = o_accept_languages.to_mut();
@@ -126,7 +123,7 @@ fn canonicalize_language_tag(token: &mut [u8]) {
*c = c.to_ascii_lowercase();
}
let sub_tags = token.split_mut(|c| *c == ('-' as u8));
let sub_tags = token.split_mut(|c| *c == b'-');
for (i, sub_tag) in sub_tags.enumerate() {
if i == 0 {
// ISO 639-1 language code, like the "en" in "en-US"
@@ -153,7 +150,7 @@ fn canonicalize_language_tag(token: &mut [u8]) {
}
#[no_mangle]
pub extern "C" fn rust_net_is_valid_ipv4_addr<'a>(addr: &'a nsACString) -> bool {
pub extern "C" fn rust_net_is_valid_ipv4_addr(addr: &nsACString) -> bool {
is_valid_ipv4_addr(addr)
}
@@ -162,7 +159,7 @@ fn try_apply_digit(current_octet: u8, digit_to_apply: u8) -> Option<u8> {
current_octet.checked_mul(10)?.checked_add(digit_to_apply)
}
pub fn is_valid_ipv4_addr<'a>(addr: &'a [u8]) -> bool {
pub fn is_valid_ipv4_addr(addr: &[u8]) -> bool {
let mut current_octet: Option<u8> = None;
let mut dots: u8 = 0;
for c in addr {
@@ -175,7 +172,7 @@ pub fn is_valid_ipv4_addr<'a>(addr: &'a [u8]) -> bool {
return false;
}
Some(_) => {
dots = dots + 1;
dots += 1;
current_octet = None;
}
}
@@ -212,21 +209,11 @@ pub fn is_valid_ipv4_addr<'a>(addr: &'a [u8]) -> bool {
}
#[no_mangle]
pub extern "C" fn rust_net_is_valid_ipv6_addr<'a>(addr: &'a nsACString) -> bool {
pub extern "C" fn rust_net_is_valid_ipv6_addr(addr: &nsACString) -> bool {
is_valid_ipv6_addr(addr)
}
#[inline(always)]
fn fast_is_hex_digit(c: u8) -> bool {
match c {
b'0'..=b'9' => true,
b'a'..=b'f' => true,
b'A'..=b'F' => true,
_ => false,
}
}
pub fn is_valid_ipv6_addr<'a>(addr: &'a [u8]) -> bool {
pub fn is_valid_ipv6_addr(addr: &[u8]) -> bool {
let mut double_colon = false;
let mut colon_before = false;
let mut digits: u8 = 0;
@@ -240,7 +227,7 @@ pub fn is_valid_ipv6_addr<'a>(addr: &'a [u8]) -> bool {
//Enumerate with an u8 for cache locality
for (i, c) in (0u8..).zip(addr) {
match c {
maybe_digit if fast_is_hex_digit(*maybe_digit) => {
maybe_digit if maybe_digit.is_ascii_hexdigit() => {
// Too many digits in the block
if digits == 4 {
return false;
@@ -293,7 +280,7 @@ pub extern "C" fn rust_net_is_valid_scheme_char(a_char: u8) -> bool {
}
#[no_mangle]
pub extern "C" fn rust_net_is_valid_scheme<'a>(scheme: &'a nsACString) -> bool {
pub extern "C" fn rust_net_is_valid_scheme(scheme: &nsACString) -> bool {
if scheme.is_empty() {
return false;
}
@@ -315,7 +302,7 @@ fn is_valid_scheme_char(a_char: u8) -> bool {
pub type ParsingCallback = extern "C" fn(&ThinVec<nsCString>) -> bool;
#[no_mangle]
pub extern "C" fn rust_parse_etc_hosts<'a>(path: &'a nsACString, callback: ParsingCallback) {
pub extern "C" fn rust_parse_etc_hosts(path: &nsACString, callback: ParsingCallback) {
let file = match File::open(&*path.to_utf8()) {
Ok(file) => io::BufReader::new(file),
Err(..) => return,

1
tools/lint/clippy.yml
View File

@@ -15,6 +15,7 @@ clippy:
- modules/libpref/init/static_prefs/
- mozglue/static/rust/
- netwerk/base/mozurl/
- netwerk/base/rust-helper/
- netwerk/test/http3server/
- netwerk/socket/neqo_glue/
- security/manager/ssl/data_storage/