Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 06:38:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

url: Only truncate data URLs for Debug (#32177)

Browse source 
Other types of URLs aren't so long that they need to be truncated.
This commit is contained in:
Martin Robinson 2024-04-29 17:29:47 +02:00 • committed by GitHub
parent 4a12c06309
commit adcaf2e881
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/url/lib.rs
View file

@ -23,6 +23,9 @@ pub use url::Host;
use url::{Position, Url}; use url::{Position, Url};
pub use crate::origin::{ImmutableOrigin, MutableOrigin, OpaqueOrigin}; pub use crate::origin::{ImmutableOrigin, MutableOrigin, OpaqueOrigin};
const DATA_URL_DISPLAY_LENGTH: usize = 40;
#[derive(Debug)] #[derive(Debug)]
pub enum UrlError { pub enum UrlError {
SetUsername, SetUsername,
@ -266,14 +269,23 @@ impl fmt::Display for ServoUrl {
impl fmt::Debug for ServoUrl { impl fmt::Debug for ServoUrl {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
if self.0.as_str().len() > 40 { let url_string = self.0.as_str();
if self.scheme() != "data" || url_string.len() <= DATA_URL_DISPLAY_LENGTH {
return url_string.fmt(formatter);
}
let mut hasher = DefaultHasher::new(); let mut hasher = DefaultHasher::new();
hasher.write(self.0.as_str().as_bytes()); hasher.write(self.0.as_str().as_bytes());
let truncated: String = self.0.as_str().chars().take(40).collect();
let result = format!("{}... ({:x})", truncated, hasher.finish()); format!(
return result.fmt(formatter); "{}... ({:x})",
} url_string
self.0.fmt(formatter) .chars()
.take(DATA_URL_DISPLAY_LENGTH)
.collect::<String>(),
hasher.finish()
)
.fmt(formatter)
} }
} }