upstream/mercurial-mirror Files · rust/hg-core/src/utils/files.rs

py3: hack around inconsistency of type of name passed to DNSQuestion...

py3: hack around inconsistency of type of name passed to DNSQuestion I don't like this patch but this is the easiest way I could fix it. There are some callers which pass name which is bytes, some pass name which is str. I just encode() that if that's str. This does makes test-paths.t pass, but I am not confident whether the whole of zeroconf will work on py3 or not. Differential Revision: https://phab.mercurial-scm.org/D6511

Yuya Nishihara - - Load All Authors

File last commit:

r42684:f305f1d7 default


                r42754:8306b6c2

default

Download file

             files.rs
        
                    19 lines
            
             | 509 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / src / utils / files.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      use std::path::Path;

      pub fn get_path_from_bytes(bytes: &[u8]) -> &Path {

          let os_str;

          #[cfg(unix)]

          {

              use std::os::unix::ffi::OsStrExt;

              os_str = std::ffi::OsStr::from_bytes(bytes);

          }

          #[cfg(windows)]

          {

              // TODO: convert from Windows MBCS (ANSI encoding) to WTF8.

              // Perhaps, the return type would have to be Result<PathBuf>.

              use std::os::windows::ffi::OsStrExt;

              os_str = std::ffi::OsString::from_wide(bytes);

          }

          Path::new(os_str)

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				use std::path::Path;

				pub fn get_path_from_bytes(bytes: &[u8]) -> &Path {
				let os_str;
				#[cfg(unix)]
				{
				use std::os::unix::ffi::OsStrExt;
				os_str = std::ffi::OsStr::from_bytes(bytes);
				}
				#[cfg(windows)]
				{
				// TODO: convert from Windows MBCS (ANSI encoding) to WTF8.
				// Perhaps, the return type would have to be Result<PathBuf>.
				use std::os::windows::ffi::OsStrExt;
				os_str = std::ffi::OsString::from_wide(bytes);
				}

				Path::new(os_str)
				}