소스 검색

Fix some more deprecation warnings

Simon Sapin 7 년 전
부모
커밋
e121d8d0aa
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 2
      data-url/src/lib.rs
  2. 3 3
      data-url/src/mime.rs

+ 2 - 2
data-url/src/lib.rs

@@ -128,7 +128,7 @@ impl<'a> FragmentIdentifier<'a> {
 ///   - ASCII tabs and newlines in the middle are **not** removed
 fn pretend_parse_data_url(input: &str) -> Option<&str> {
     // Trim C0 control or space
-    let left_trimmed = input.trim_left_matches(|ch| ch <= ' ');
+    let left_trimmed = input.trim_start_matches(|ch| ch <= ' ');
 
     let mut bytes = left_trimmed.bytes();
     {
@@ -146,7 +146,7 @@ fn pretend_parse_data_url(input: &str) -> Option<&str> {
     let after_colon = &left_trimmed[bytes_consumed..];
 
     // Trim C0 control or space
-    Some(after_colon.trim_right_matches(|ch| ch <= ' '))
+    Some(after_colon.trim_end_matches(|ch| ch <= ' '))
 }
 
 fn find_comma_before_fragment(after_colon: &str) -> Option<(&str, &str)> {

+ 3 - 3
data-url/src/mime.rs

@@ -41,7 +41,7 @@ fn parse(s: &str) -> Option<Mime> {
     require!(only_http_token_code_points(type_) && !type_.is_empty());
 
     let (subtype, rest) = split2(rest?, ';');
-    let subtype = subtype.trim_right_matches(ascii_whitespace);
+    let subtype = subtype.trim_end_matches(ascii_whitespace);
     require!(only_http_token_code_points(subtype) && !subtype.is_empty());
 
     let mut parameters = Vec::new();
@@ -66,7 +66,7 @@ fn parse_parameters(s: &str, parameters: &mut Vec<(String, String)>) {
     let mut semicolon_separated = s.split(';');
 
     while let Some(piece) = semicolon_separated.next() {
-        let piece = piece.trim_left_matches(ascii_whitespace);
+        let piece = piece.trim_start_matches(ascii_whitespace);
         let (name, value) = split2(piece, '=');
         if name.is_empty() || !only_http_token_code_points(name) || contains(&parameters, name) {
             continue;
@@ -98,7 +98,7 @@ fn parse_parameters(s: &str, parameters: &mut Vec<(String, String)>) {
                 }
                 unescaped_value
             } else {
-                let value = value.trim_right_matches(ascii_whitespace);
+                let value = value.trim_end_matches(ascii_whitespace);
                 if !valid_value(value) {
                     continue;
                 }