@@ -502,7 +502,7 @@ impl AuthMiddleware {
502502 // Nothing to insert into the cache if we don't have credentials
503503 return next. run ( request, extensions) . await ;
504504 } ;
505- let url = DisplaySafeUrl :: from ( request. url ( ) . clone ( ) ) ;
505+ let url = DisplaySafeUrl :: from_url ( request. url ( ) . clone ( ) ) ;
506506 if matches ! ( auth_policy, AuthPolicy :: Always ) && credentials. password ( ) . is_none ( ) {
507507 return Err ( Error :: Middleware ( format_err ! ( "Missing password for {url}" ) ) ) ;
508508 }
@@ -801,7 +801,7 @@ impl AuthMiddleware {
801801}
802802
803803fn tracing_url ( request : & Request , credentials : Option < & Authentication > ) -> DisplaySafeUrl {
804- let mut url = DisplaySafeUrl :: from ( request. url ( ) . clone ( ) ) ;
804+ let mut url = DisplaySafeUrl :: from_url ( request. url ( ) . clone ( ) ) ;
805805 if let Some ( Authentication :: Credentials ( creds) ) = credentials {
806806 if let Some ( username) = creds. username ( ) {
807807 let _ = url. set_username ( username) ;
@@ -1990,13 +1990,13 @@ mod tests {
19901990 let base_url_2 = base_url. join ( "prefix_2" ) ?;
19911991 let indexes = Indexes :: from_indexes ( vec ! [
19921992 Index {
1993- url: DisplaySafeUrl :: from ( base_url_1. clone( ) ) ,
1994- root_url: DisplaySafeUrl :: from ( base_url_1. clone( ) ) ,
1993+ url: DisplaySafeUrl :: from_url ( base_url_1. clone( ) ) ,
1994+ root_url: DisplaySafeUrl :: from_url ( base_url_1. clone( ) ) ,
19951995 auth_policy: AuthPolicy :: Auto ,
19961996 } ,
19971997 Index {
1998- url: DisplaySafeUrl :: from ( base_url_2. clone( ) ) ,
1999- root_url: DisplaySafeUrl :: from ( base_url_2. clone( ) ) ,
1998+ url: DisplaySafeUrl :: from_url ( base_url_2. clone( ) ) ,
1999+ root_url: DisplaySafeUrl :: from_url ( base_url_2. clone( ) ) ,
20002000 auth_policy: AuthPolicy :: Auto ,
20012001 } ,
20022002 ] ) ;
@@ -2098,8 +2098,8 @@ mod tests {
20982098 let base_url = Url :: parse ( & server. uri ( ) ) ?;
20992099 let index_url = base_url. join ( "prefix_1" ) ?;
21002100 let indexes = Indexes :: from_indexes ( vec ! [ Index {
2101- url: DisplaySafeUrl :: from ( index_url. clone( ) ) ,
2102- root_url: DisplaySafeUrl :: from ( index_url. clone( ) ) ,
2101+ url: DisplaySafeUrl :: from_url ( index_url. clone( ) ) ,
2102+ root_url: DisplaySafeUrl :: from_url ( index_url. clone( ) ) ,
21032103 auth_policy: AuthPolicy :: Auto ,
21042104 } ] ) ;
21052105
@@ -2153,7 +2153,7 @@ mod tests {
21532153 }
21542154
21552155 fn indexes_for ( url : & Url , policy : AuthPolicy ) -> Indexes {
2156- let mut url = DisplaySafeUrl :: from ( url. clone ( ) ) ;
2156+ let mut url = DisplaySafeUrl :: from_url ( url. clone ( ) ) ;
21572157 url. set_password ( None ) . ok ( ) ;
21582158 url. set_username ( "" ) . ok ( ) ;
21592159 Indexes :: from_indexes ( vec ! [ Index {
0 commit comments