Skip to content
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.

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

Rollup of 8 pull requests #83873

Closed
wants to merge 21 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7f5964a
Add `download-rustc = "if-unchanged"`
jyn514 Mar 22, 2021
8a05892
List trait impls before methods from deref in the sidebar of Rustdoc'…
slightlyoutofphase Apr 3, 2021
72502e8
Remove trailing whitespace
slightlyoutofphase Apr 3, 2021
a3d0fa8
Add `#[inline]` to IpAddr methods
AngelicosPhosphoros Apr 3, 2021
ba65f37
Disallow the use of high byte registes as operands on x86_64
Amanieu Apr 4, 2021
14406df
Use the beta compiler for building bootstrap tools when `download-rus…
jyn514 Feb 10, 2021
48f95c1
Remove duplicate unwrap_or_else
jyn514 Apr 4, 2021
16444c3
Reduce indentation in `resolve_associated_item`
jyn514 Apr 4, 2021
82b2863
Render destructured struct function param names as underscore.
eggyal Apr 4, 2021
45ccd50
Don't report disambiguator error if link would have been ignored
camelid Apr 4, 2021
01be6dd
Merge branch 'master' of github.com:rust-lang/rust into issue-83852
eggyal Apr 4, 2021
14fac68
Renamed test
eggyal Apr 4, 2021
3611a64
Use more appropriate return type for `resolve_associated_item`
jyn514 Apr 4, 2021
fdab4f3
Rollup merge of #82739 - jyn514:separate-stage0-stage1, r=Mark-Simula…
Dylan-DPC Apr 5, 2021
9f240c1
Rollup merge of #83368 - jyn514:download-if-unchanged, r=Mark-Simulacrum
Dylan-DPC Apr 5, 2021
14214df
Rollup merge of #83826 - slightlyoutofphase:rustdoc-sidebar-order-shu…
Dylan-DPC Apr 5, 2021
2bba1be
Rollup merge of #83831 - AngelicosPhosphoros:issue-77583-inline-for-i…
Dylan-DPC Apr 5, 2021
317c514
Rollup merge of #83849 - jyn514:intra-doc-cleanup, r=bugadani
Dylan-DPC Apr 5, 2021
657bdbc
Rollup merge of #83853 - Amanieu:asm_no_high_x86_64, r=nagisa
Dylan-DPC Apr 5, 2021
14f858f
Rollup merge of #83863 - eggyal:issue-83852, r=jyn514
Dylan-DPC Apr 5, 2021
1069434
Rollup merge of #83865 - camelid:disamb-err-fix, r=jyn514
Dylan-DPC Apr 5, 2021
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
2 changes: 0 additions & 2 deletions compiler/rustc_target/src/asm/arm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ fn frame_pointer_r11(
_arch: InlineAsmArch,
has_feature: impl FnMut(&str) -> bool,
target: &Target,
_allocating: bool,
) -> Result<(), &'static str> {
if !frame_pointer_is_r7(has_feature, target) {
Err("the frame pointer (r11) cannot be used as an operand for inline asm")
Expand All @@ -81,7 +80,6 @@ fn frame_pointer_r7(
_arch: InlineAsmArch,
has_feature: impl FnMut(&str) -> bool,
target: &Target,
_allocating: bool,
) -> Result<(), &'static str> {
if frame_pointer_is_r7(has_feature, target) {
Err("the frame pointer (r7) cannot be used as an operand for inline asm")
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_target/src/asm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ macro_rules! def_regs {
match name {
$(
$($alias)|* | $reg_name => {
$($filter(_arch, &mut _has_feature, _target, false)?;)?
$($filter(_arch, &mut _has_feature, _target)?;)?
Ok(Self::$reg)
}
)*
Expand All @@ -114,7 +114,7 @@ macro_rules! def_regs {
#[allow(unused_imports)]
use super::{InlineAsmReg, InlineAsmRegClass};
$(
if $($filter(_arch, &mut _has_feature, _target, true).is_ok() &&)? true {
if $($filter(_arch, &mut _has_feature, _target).is_ok() &&)? true {
if let Some(set) = _map.get_mut(&InlineAsmRegClass::$arch($arch_regclass::$class)) {
set.insert(InlineAsmReg::$arch($arch_reg::$reg));
}
Expand Down
1 change: 0 additions & 1 deletion compiler/rustc_target/src/asm/riscv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ fn not_e(
_arch: InlineAsmArch,
mut has_feature: impl FnMut(&str) -> bool,
_target: &Target,
_allocating: bool,
) -> Result<(), &'static str> {
if has_feature("e") {
Err("register can't be used with the `e` target feature")
Expand Down
7 changes: 1 addition & 6 deletions compiler/rustc_target/src/asm/x86.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ fn x86_64_only(
arch: InlineAsmArch,
_has_feature: impl FnMut(&str) -> bool,
_target: &Target,
_allocating: bool,
) -> Result<(), &'static str> {
match arch {
InlineAsmArch::X86 => Err("register is only available on x86_64"),
Expand All @@ -146,13 +145,9 @@ fn high_byte(
arch: InlineAsmArch,
_has_feature: impl FnMut(&str) -> bool,
_target: &Target,
allocating: bool,
) -> Result<(), &'static str> {
match arch {
InlineAsmArch::X86_64 if allocating => {
// The error message isn't actually used...
Err("high byte registers are not allocated by reg_byte")
}
InlineAsmArch::X86_64 => Err("high byte registers cannot be used as an operand on x86_64"),
_ => Ok(()),
}
}
Expand Down
4 changes: 3 additions & 1 deletion config.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,9 @@ changelog-seen = 2
# Whether to download the stage 1 and 2 compilers from CI.
# This is mostly useful for tools; if you have changes to `compiler/` they will be ignored.
#
# FIXME: currently, this also uses the downloaded compiler for stage0, but that causes unnecessary rebuilds.
# You can set this to "if-unchanged" to only download if `compiler/` has not been modified.
#
# FIXME(#82739): currently, this also uses the downloaded compiler for stage0, but that causes unnecessary rebuilds.
#download-rustc = false

# Number of codegen units to use for each compiler invocation. A value of 0
Expand Down
3 changes: 3 additions & 0 deletions library/std/src/net/ip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -993,6 +993,7 @@ impl Ord for Ipv4Addr {
}

impl IntoInner<c::in_addr> for Ipv4Addr {
#[inline]
fn into_inner(self) -> c::in_addr {
self.inner
}
Expand Down Expand Up @@ -1800,11 +1801,13 @@ impl Ord for Ipv6Addr {
}

impl AsInner<c::in6_addr> for Ipv6Addr {
#[inline]
fn as_inner(&self) -> &c::in6_addr {
&self.inner
}
}
impl FromInner<c::in6_addr> for Ipv6Addr {
#[inline]
fn from_inner(addr: c::in6_addr) -> Ipv6Addr {
Ipv6Addr { inner: addr }
}
Expand Down
Loading