Skip to content

Rollup of 5 pull requests #59721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 5, 2019
Merged

Rollup of 5 pull requests #59721

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5b8bfe0
improve worst-case performance of HashSet.is_subset
ssomers Apr 3, 2019
a37c33b
Mark unix::ffi::OsStrExt methods as inline
LunaBorowska Apr 4, 2019
fdb8752
cleanup shebang handling in the lexer
matklad Apr 4, 2019
a964921
Use declare_lint_pass! and impl_lint_pass! in more places
hgallagher1993 Apr 4, 2019
471db2b
wasm32: Default to a "static" relocation model
alexcrichton Apr 4, 2019
a3122e1
Rollup merge of #59665 - ssomers:hashset_revisited, r=KodrAus
Centril Apr 5, 2019
2e7be1e
Rollup merge of #59687 - matklad:shebang, r=petrochenkov
Centril Apr 5, 2019
c392832
Rollup merge of #59690 - xfix:patch-17, r=cramertj
Centril Apr 5, 2019
c0ed443
Rollup merge of #59702 - hgallagher1993:origin, r=Centril
Centril Apr 5, 2019
7249036
Rollup merge of #59712 - alexcrichton:wasm-static-not-pic, r=eddyb
Centril Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libstd/ffi/os_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,7 @@ impl IntoInner<Buf> for OsString {
}

impl AsInner<Slice> for OsStr {
#[inline]
fn as_inner(&self) -> &Slice {
&self.inner
}
Expand Down
2 changes: 2 additions & 0 deletions src/libstd/sys_common/os_str_bytes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down