diff options
| author | bors <bors@rust-lang.org> | 2019-04-05 12:13:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-05 12:13:52 +0000 |
| commit | 4d7defb26584b0d4e5cad372b2ab8888bfc22f3a (patch) | |
| tree | 701541189e7d5651cb6553be6b8bdaf4ec881559 /src/libstd/sys_common | |
| parent | a781c47243a5ebde3f84a9635ffddd1cfc82ed9c (diff) | |
| parent | 7249036de5c6a2e8aad93512e3f529f3024d03e5 (diff) | |
| download | rust-4d7defb26584b0d4e5cad372b2ab8888bfc22f3a.tar.gz rust-4d7defb26584b0d4e5cad372b2ab8888bfc22f3a.zip | |
Auto merge of #59721 - Centril:rollup-ieam9ke, r=Centril
Rollup of 5 pull requests Successful merges: - #59665 (improve worst-case performance of HashSet.is_subset) - #59687 (cleanup shebang handling in the lexer) - #59690 (Mark unix::ffi::OsStrExt methods as inline) - #59702 (Use declare_lint_pass! and impl_lint_pass! in more places) - #59712 (wasm32: Default to a "static" relocation model) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/os_str_bytes.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/sys_common/os_str_bytes.rs b/src/libstd/sys_common/os_str_bytes.rs index 7cc93477a73..a4961974d89 100644 --- a/src/libstd/sys_common/os_str_bytes.rs +++ b/src/libstd/sys_common/os_str_bytes.rs @@ -236,9 +236,11 @@ pub trait OsStrExt { #[stable(feature = "rust1", since = "1.0.0")] impl OsStrExt for OsStr { + #[inline] fn from_bytes(slice: &[u8]) -> &OsStr { unsafe { mem::transmute(slice) } } + #[inline] fn as_bytes(&self) -> &[u8] { &self.as_inner().inner } |