Skip to content

Commit c6b172f

Browse files
borsbors
committed
Auto merge of rust-lang#70246 - Dylan-DPC:rollup-vt9wex2, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - rust-lang#70003 (symbol_names: treat ReifyShim like VtableShim.) - rust-lang#70051 (Allow `hir().find` to return `None`) - rust-lang#70126 (Fix ICE caused by truncating a negative ZST enum discriminant) - rust-lang#70197 (For issue 53957: revise unit test to focus on underlying bug of 23076.) - rust-lang#70215 (ast: Compress `AttrId` from `usize` to `u32`) - rust-lang#70218 (Fix deprecated Error.description() usage in docs) - rust-lang#70228 (Remove CARGO_BUILD_TARGET from bootstrap.py) - rust-lang#70231 (Add explanation message for E0224) - rust-lang#70232 (Tweak wording for std::io::Read::read function) - rust-lang#70238 (Add a test for out-of-line module passed through a proc macro) Failed merges: r? @ghost
2 parents 38114ff + 17e6ed1 commit c6b172f

27 files changed

+208
-58
lines changed

Diff for: ‎src/bootstrap/bootstrap.py

+4
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,10 @@ def build_bootstrap(self):
664664
if self.clean and os.path.exists(build_dir):
665665
shutil.rmtree(build_dir)
666666
env = os.environ.copy()
667+
# `CARGO_BUILD_TARGET` breaks bootstrap build.
668+
# See also: <https://github.com/rust-lang/rust/issues/70208>.
669+
if "CARGO_BUILD_TARGET" in env:
670+
del env["CARGO_BUILD_TARGET"]
667671
env["RUSTC_BOOTSTRAP"] = '1'
668672
env["CARGO_TARGET_DIR"] = build_dir
669673
env["RUSTC"] = self.rustc()

Diff for: ‎src/librustc/hir/map/mod.rs

+19-13
Original file line numberDiff line numberDiff line change
@@ -337,23 +337,28 @@ impl<'hir> Map<'hir> {
337337
}
338338

339339
fn find_entry(&self, id: HirId) -> Option<Entry<'hir>> {
340-
Some(self.get_entry(id))
341-
}
342-
343-
fn get_entry(&self, id: HirId) -> Entry<'hir> {
344340
if id.local_id == ItemLocalId::from_u32(0) {
345341
let owner = self.tcx.hir_owner(id.owner);
346-
Entry { parent: owner.parent, node: owner.node }
342+
owner.map(|owner| Entry { parent: owner.parent, node: owner.node })
347343
} else {
348344
let owner = self.tcx.hir_owner_nodes(id.owner);
349-
let node = owner.nodes[id.local_id].as_ref().unwrap();
350-
// FIXME(eddyb) use a single generic type insted of having both
351-
// `Entry` and `ParentedNode`, which are effectively the same.
352-
// Alternatively, rewrite code using `Entry` to use `ParentedNode`.
353-
Entry { parent: HirId { owner: id.owner, local_id: node.parent }, node: node.node }
345+
owner.and_then(|owner| {
346+
let node = owner.nodes[id.local_id].as_ref();
347+
// FIXME(eddyb) use a single generic type insted of having both
348+
// `Entry` and `ParentedNode`, which are effectively the same.
349+
// Alternatively, rewrite code using `Entry` to use `ParentedNode`.
350+
node.map(|node| Entry {
351+
parent: HirId { owner: id.owner, local_id: node.parent },
352+
node: node.node,
353+
})
354+
})
354355
}
355356
}
356357

358+
fn get_entry(&self, id: HirId) -> Entry<'hir> {
359+
self.find_entry(id).unwrap()
360+
}
361+
357362
pub fn item(&self, id: HirId) -> &'hir Item<'hir> {
358363
match self.find(id).unwrap() {
359364
Node::Item(item) => item,
@@ -376,7 +381,7 @@ impl<'hir> Map<'hir> {
376381
}
377382

378383
pub fn body(&self, id: BodyId) -> &'hir Body<'hir> {
379-
self.tcx.hir_owner_nodes(id.hir_id.owner).bodies.get(&id.hir_id.local_id).unwrap()
384+
self.tcx.hir_owner_nodes(id.hir_id.owner).unwrap().bodies.get(&id.hir_id.local_id).unwrap()
380385
}
381386

382387
pub fn fn_decl_by_hir_id(&self, hir_id: HirId) -> Option<&'hir FnDecl<'hir>> {
@@ -536,8 +541,9 @@ impl<'hir> Map<'hir> {
536541

537542
/// Retrieves the `Node` corresponding to `id`, returning `None` if cannot be found.
538543
pub fn find(&self, hir_id: HirId) -> Option<Node<'hir>> {
539-
let node = self.get_entry(hir_id).node;
540-
if let Node::Crate(..) = node { None } else { Some(node) }
544+
self.find_entry(hir_id).and_then(|entry| {
545+
if let Node::Crate(..) = entry.node { None } else { Some(entry.node) }
546+
})
541547
}
542548

543549
/// Similar to `get_parent`; returns the parent HIR Id, or just `hir_id` if there

Diff for: ‎src/librustc/hir/mod.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ pub fn provide(providers: &mut Providers<'_>) {
7878
let module = hir.as_local_hir_id(id.to_def_id()).unwrap();
7979
&tcx.untracked_crate.modules[&module]
8080
};
81-
providers.hir_owner = |tcx, id| tcx.index_hir(LOCAL_CRATE).map[id].signature.unwrap();
82-
providers.hir_owner_nodes = |tcx, id| {
83-
tcx.index_hir(LOCAL_CRATE).map[id].with_bodies.as_ref().map(|nodes| &**nodes).unwrap()
84-
};
81+
providers.hir_owner = |tcx, id| tcx.index_hir(LOCAL_CRATE).map[id].signature;
82+
providers.hir_owner_nodes =
83+
|tcx, id| tcx.index_hir(LOCAL_CRATE).map[id].with_bodies.as_ref().map(|nodes| &**nodes);
8584
map::provide(providers);
8685
}

Diff for: ‎src/librustc/query/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ rustc_queries! {
7676
//
7777
// This can be conveniently accessed by methods on `tcx.hir()`.
7878
// Avoid calling this query directly.
79-
query hir_owner(key: LocalDefId) -> &'tcx crate::hir::Owner<'tcx> {
79+
query hir_owner(key: LocalDefId) -> Option<&'tcx crate::hir::Owner<'tcx>> {
8080
eval_always
8181
desc { |tcx| "HIR owner of `{}`", tcx.def_path_str(key.to_def_id()) }
8282
}
@@ -85,7 +85,7 @@ rustc_queries! {
8585
//
8686
// This can be conveniently accessed by methods on `tcx.hir()`.
8787
// Avoid calling this query directly.
88-
query hir_owner_nodes(key: LocalDefId) -> &'tcx crate::hir::OwnerNodes<'tcx> {
88+
query hir_owner_nodes(key: LocalDefId) -> Option<&'tcx crate::hir::OwnerNodes<'tcx>> {
8989
eval_always
9090
desc { |tcx| "HIR owner items in `{}`", tcx.def_path_str(key.to_def_id()) }
9191
}

Diff for: ‎src/librustc/ty/instance.rs

-4
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,6 @@ impl<'tcx> Instance<'tcx> {
406406
| InstanceDef::VtableShim(..) => Some(self.substs),
407407
}
408408
}
409-
410-
pub fn is_vtable_shim(&self) -> bool {
411-
if let InstanceDef::VtableShim(..) = self.def { true } else { false }
412-
}
413409
}
414410

415411
fn needs_fn_once_adapter_shim(

Diff for: ‎src/librustc_ast/ast.rs

+8-14
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ use crate::tokenstream::{DelimSpan, TokenStream, TokenTree};
3131
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
3232
use rustc_data_structures::sync::Lrc;
3333
use rustc_data_structures::thin_vec::ThinVec;
34-
use rustc_index::vec::Idx;
3534
use rustc_macros::HashStable_Generic;
3635
use rustc_serialize::{self, Decoder, Encoder};
3736
use rustc_span::source_map::{respan, Spanned};
@@ -2251,27 +2250,22 @@ pub enum AttrStyle {
22512250
Inner,
22522251
}
22532252

2254-
#[derive(Clone, PartialEq, Eq, Hash, Debug, PartialOrd, Ord, Copy)]
2255-
pub struct AttrId(pub usize);
2256-
2257-
impl Idx for AttrId {
2258-
fn new(idx: usize) -> Self {
2259-
AttrId(idx)
2260-
}
2261-
fn index(self) -> usize {
2262-
self.0
2253+
rustc_index::newtype_index! {
2254+
pub struct AttrId {
2255+
ENCODABLE = custom
2256+
DEBUG_FORMAT = "AttrId({})"
22632257
}
22642258
}
22652259

22662260
impl rustc_serialize::Encodable for AttrId {
2267-
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
2268-
s.emit_unit()
2261+
fn encode<S: Encoder>(&self, _: &mut S) -> Result<(), S::Error> {
2262+
Ok(())
22692263
}
22702264
}
22712265

22722266
impl rustc_serialize::Decodable for AttrId {
2273-
fn decode<D: Decoder>(d: &mut D) -> Result<AttrId, D::Error> {
2274-
d.read_nil().map(|_| crate::attr::mk_attr_id())
2267+
fn decode<D: Decoder>(_: &mut D) -> Result<AttrId, D::Error> {
2268+
Ok(crate::attr::mk_attr_id())
22752269
}
22762270
}
22772271

Diff for: ‎src/librustc_ast/attr/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -366,14 +366,14 @@ pub fn mk_nested_word_item(ident: Ident) -> NestedMetaItem {
366366
}
367367

368368
crate fn mk_attr_id() -> AttrId {
369-
use std::sync::atomic::AtomicUsize;
369+
use std::sync::atomic::AtomicU32;
370370
use std::sync::atomic::Ordering;
371371

372-
static NEXT_ATTR_ID: AtomicUsize = AtomicUsize::new(0);
372+
static NEXT_ATTR_ID: AtomicU32 = AtomicU32::new(0);
373373

374374
let id = NEXT_ATTR_ID.fetch_add(1, Ordering::SeqCst);
375-
assert!(id != ::std::usize::MAX);
376-
AttrId(id)
375+
assert!(id != u32::MAX);
376+
AttrId::from_u32(id)
377377
}
378378

379379
pub fn mk_attr(style: AttrStyle, path: Path, args: MacArgs, span: Span) -> Attribute {

Diff for: ‎src/librustc_codegen_ssa/mir/rvalue.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,12 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
293293
if let Some(discr) =
294294
operand.layout.ty.discriminant_for_variant(bx.tcx(), index)
295295
{
296-
let discr_val = bx.cx().const_uint_big(ll_t_out, discr.val);
296+
let discr_layout = bx.cx().layout_of(discr.ty);
297+
let discr_t = bx.cx().immediate_backend_type(discr_layout);
298+
let discr_val = bx.cx().const_uint_big(discr_t, discr.val);
299+
let discr_val =
300+
bx.intcast(discr_val, ll_t_out, discr.ty.is_signed());
301+
297302
return (
298303
bx,
299304
OperandRef {

Diff for: ‎src/librustc_error_codes/error_codes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ E0220: include_str!("./error_codes/E0220.md"),
118118
E0221: include_str!("./error_codes/E0221.md"),
119119
E0222: include_str!("./error_codes/E0222.md"),
120120
E0223: include_str!("./error_codes/E0223.md"),
121+
E0224: include_str!("./error_codes/E0224.md"),
121122
E0225: include_str!("./error_codes/E0225.md"),
122123
E0229: include_str!("./error_codes/E0229.md"),
123124
E0230: include_str!("./error_codes/E0230.md"),
@@ -469,7 +470,6 @@ E0748: include_str!("./error_codes/E0748.md"),
469470
// E0217, // ambiguous associated type, defined in multiple supertraits
470471
// E0218, // no associated type defined
471472
// E0219, // associated type defined in higher-ranked supertrait
472-
E0224, // at least one non-builtin train is required for an object type
473473
E0226, // only a single explicit lifetime bound is permitted
474474
E0227, // ambiguous lifetime bound, explicit lifetime bound required
475475
E0228, // explicit lifetime bound required

Diff for: ‎src/librustc_error_codes/error_codes/E0224.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
A trait object was declaired with no traits.
2+
3+
Erroneous code example:
4+
5+
```compile_fail,E0224
6+
type Foo = dyn 'static +;
7+
```
8+
9+
Rust does not currently support this.
10+
11+
To solve ensure the the trait object has at least one trait:
12+
13+
```
14+
type Foo = dyn 'static + Copy;
15+
```

Diff for: ‎src/librustc_mir/interpret/cast.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use rustc::ty::layout::{self, Size, TyLayout};
33
use rustc::ty::{self, Ty, TypeAndMut, TypeFoldable};
44
use rustc_ast::ast::FloatTy;
55
use rustc_span::symbol::sym;
6+
use rustc_target::abi::LayoutOf;
67

78
use rustc::mir::interpret::{InterpResult, PointerArithmetic, Scalar};
89
use rustc::mir::CastKind;
@@ -134,7 +135,10 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
134135
layout::Variants::Single { index } => {
135136
if let Some(discr) = src.layout.ty.discriminant_for_variant(*self.tcx, index) {
136137
assert!(src.layout.is_zst());
137-
return Ok(Scalar::from_uint(discr.val, dest_layout.size).into());
138+
let discr_layout = self.layout_of(discr.ty)?;
139+
return Ok(self
140+
.cast_from_int_like(discr.val, discr_layout, dest_layout)?
141+
.into());
138142
}
139143
}
140144
layout::Variants::Multiple { .. } => {}
@@ -171,10 +175,10 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
171175
// (b) cast from an integer-like (including bool, char, enums).
172176
// In both cases we want the bits.
173177
let bits = self.force_bits(src.to_scalar()?, src.layout.size)?;
174-
Ok(self.cast_from_int(bits, src.layout, dest_layout)?.into())
178+
Ok(self.cast_from_int_like(bits, src.layout, dest_layout)?.into())
175179
}
176180

177-
fn cast_from_int(
181+
fn cast_from_int_like(
178182
&self,
179183
v: u128, // raw bits
180184
src_layout: TyLayout<'tcx>,

Diff for: ‎src/librustc_symbol_mangling/legacy.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,14 @@ pub(super) fn mangle(
5959
.print_def_path(def_id, &[])
6060
.unwrap();
6161

62-
if instance.is_vtable_shim() {
62+
if let ty::InstanceDef::VtableShim(..) = instance.def {
6363
let _ = printer.write_str("{{vtable-shim}}");
6464
}
6565

66+
if let ty::InstanceDef::ReifyShim(..) = instance.def {
67+
let _ = printer.write_str("{{reify-shim}}");
68+
}
69+
6670
printer.path.finish(hash)
6771
}
6872

@@ -123,7 +127,8 @@ fn get_symbol_hash<'tcx>(
123127
}
124128

125129
// We want to avoid accidental collision between different types of instances.
126-
// Especially, VtableShim may overlap with its original instance without this.
130+
// Especially, `VtableShim`s and `ReifyShim`s may overlap with their original
131+
// instances without this.
127132
discriminant(&instance.def).hash_stable(&mut hcx, &mut hasher);
128133
});
129134

Diff for: ‎src/librustc_symbol_mangling/v0.rs

+11-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,17 @@ pub(super) fn mangle(
3434
binders: vec![],
3535
out: String::from(prefix),
3636
};
37-
cx = if instance.is_vtable_shim() {
38-
cx.path_append_ns(|cx| cx.print_def_path(def_id, substs), 'S', 0, "").unwrap()
37+
38+
// Append `::{shim:...#0}` to shims that can coexist with a non-shim instance.
39+
let shim_kind = match instance.def {
40+
ty::InstanceDef::VtableShim(_) => Some("vtable"),
41+
ty::InstanceDef::ReifyShim(_) => Some("reify"),
42+
43+
_ => None,
44+
};
45+
46+
cx = if let Some(shim_kind) = shim_kind {
47+
cx.path_append_ns(|cx| cx.print_def_path(def_id, substs), 'S', 0, shim_kind).unwrap()
3948
} else {
4049
cx.print_def_path(def_id, substs).unwrap()
4150
};

Diff for: ‎src/libstd/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub trait Error: Debug + Display {
8888
/// fn main() {
8989
/// match get_super_error() {
9090
/// Err(e) => {
91-
/// println!("Error: {}", e.description());
91+
/// println!("Error: {}", e);
9292
/// println!("Caused by: {}", e.source().unwrap());
9393
/// }
9494
/// _ => println!("No error"),

Diff for: ‎src/libstd/io/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ pub trait Read {
502502
/// how many bytes were read.
503503
///
504504
/// This function does not provide any guarantees about whether it blocks
505-
/// waiting for data, but if an object needs to block for a read but cannot
505+
/// waiting for data, but if an object needs to block for a read and cannot,
506506
/// it will typically signal this via an [`Err`] return value.
507507
///
508508
/// If the return value of this method is [`Ok(n)`], then it must be

Diff for: ‎src/libstd/net/addr.rs

+19-4
Original file line numberDiff line numberDiff line change
@@ -989,11 +989,26 @@ mod tests {
989989
// s has been moved into the tsa call
990990
}
991991

992-
// FIXME: figure out why this fails on openbsd and fix it
993992
#[test]
994-
#[cfg(not(any(windows, target_os = "openbsd")))]
995-
fn to_socket_addr_str_bad() {
996-
assert!(tsa("1200::AB00:1234::2552:7777:1313:34300").is_err());
993+
fn bind_udp_socket_bad() {
994+
// rust-lang/rust#53957: This is a regression test for a parsing problem
995+
// discovered as part of issue rust-lang/rust#23076, where we were
996+
// incorrectly parsing invalid input and then that would result in a
997+
// successful `UdpSocket` binding when we would expect failure.
998+
//
999+
// At one time, this test was written as a call to `tsa` with
1000+
// INPUT_23076. However, that structure yields an unreliable test,
1001+
// because it ends up passing junk input to the DNS server, and some DNS
1002+
// servers will respond with `Ok` to such input, with the ip address of
1003+
// the DNS server itself.
1004+
//
1005+
// This form of the test is more robust: even when the DNS server
1006+
// returns its own address, it is still an error to bind a UDP socket to
1007+
// a non-local address, and so we still get an error here in that case.
1008+
1009+
const INPUT_23076: &'static str = "1200::AB00:1234::2552:7777:1313:34300";
1010+
1011+
assert!(crate::net::UdpSocket::bind(INPUT_23076).is_err())
9971012
}
9981013

9991014
#[test]

Diff for: ‎src/test/ui/consts/cast-discriminant-zst-enum.rs

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// run-pass
2+
// Test a ZST enum whose dicriminant is ~0i128. This caused an ICE when casting to a i32.
3+
4+
#[derive(Copy, Clone)]
5+
enum Nums {
6+
NegOne = -1,
7+
}
8+
9+
const NEG_ONE_I8: i8 = Nums::NegOne as i8;
10+
const NEG_ONE_I16: i16 = Nums::NegOne as i16;
11+
const NEG_ONE_I32: i32 = Nums::NegOne as i32;
12+
const NEG_ONE_I64: i64 = Nums::NegOne as i64;
13+
const NEG_ONE_I128: i128 = Nums::NegOne as i128;
14+
15+
#[inline(never)]
16+
fn identity<T>(t: T) -> T { t }
17+
18+
fn test_as_arg(n: Nums) {
19+
assert_eq!(-1i8, n as i8);
20+
assert_eq!(-1i16, n as i16);
21+
assert_eq!(-1i32, n as i32);
22+
assert_eq!(-1i64, n as i64);
23+
assert_eq!(-1i128, n as i128);
24+
}
25+
26+
fn main() {
27+
let kind = Nums::NegOne;
28+
assert_eq!(-1i8, kind as i8);
29+
assert_eq!(-1i16, kind as i16);
30+
assert_eq!(-1i32, kind as i32);
31+
assert_eq!(-1i64, kind as i64);
32+
assert_eq!(-1i128, kind as i128);
33+
34+
assert_eq!(-1i8, identity(kind) as i8);
35+
assert_eq!(-1i16, identity(kind) as i16);
36+
assert_eq!(-1i32, identity(kind) as i32);
37+
assert_eq!(-1i64, identity(kind) as i64);
38+
assert_eq!(-1i128, identity(kind) as i128);
39+
40+
test_as_arg(Nums::NegOne);
41+
42+
assert_eq!(-1i8, NEG_ONE_I8);
43+
assert_eq!(-1i16, NEG_ONE_I16);
44+
assert_eq!(-1i32, NEG_ONE_I32);
45+
assert_eq!(-1i64, NEG_ONE_I64);
46+
assert_eq!(-1i128, NEG_ONE_I128);
47+
}

0 commit comments

Comments
 (0)