mirror of
https://github.com/rust-lang/rust.git
synced 2024-10-31 22:41:50 +00:00
Rustup to rustc 1.46.0-nightly (f781babf8
2020-07-01)
This commit is contained in:
parent
a299d0e632
commit
f3a91164a2
4
build_sysroot/Cargo.lock
generated
4
build_sysroot/Cargo.lock
generated
@ -51,9 +51,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.56"
|
||||
version = "1.0.57"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77c1f1d60091c1b73e2b1f4560ab419204b178e625fa945ded7b660becd2bd46"
|
||||
checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#![feature(
|
||||
no_core, lang_items, intrinsics, unboxed_closures, type_ascription, extern_types,
|
||||
untagged_unions, decl_macro, rustc_attrs, transparent_unions, optin_builtin_traits,
|
||||
thread_local, track_caller
|
||||
thread_local,
|
||||
)]
|
||||
#![no_core]
|
||||
#![allow(dead_code)]
|
||||
|
@ -2,8 +2,6 @@
|
||||
|
||||
// run-pass
|
||||
|
||||
#![feature(track_caller)]
|
||||
|
||||
use std::panic::Location;
|
||||
|
||||
#[track_caller]
|
||||
@ -22,21 +20,21 @@ fn nested_tracked() -> &'static Location<'static> {
|
||||
fn main() {
|
||||
let location = Location::caller();
|
||||
assert_eq!(location.file(), file!());
|
||||
assert_eq!(location.line(), 23);
|
||||
assert_eq!(location.line(), 21);
|
||||
assert_eq!(location.column(), 20);
|
||||
|
||||
let tracked = tracked();
|
||||
assert_eq!(tracked.file(), file!());
|
||||
assert_eq!(tracked.line(), 28);
|
||||
assert_eq!(tracked.line(), 26);
|
||||
assert_eq!(tracked.column(), 19);
|
||||
|
||||
let nested = nested_intrinsic();
|
||||
assert_eq!(nested.file(), file!());
|
||||
assert_eq!(nested.line(), 15);
|
||||
assert_eq!(nested.line(), 13);
|
||||
assert_eq!(nested.column(), 5);
|
||||
|
||||
let contained = nested_tracked();
|
||||
assert_eq!(contained.file(), file!());
|
||||
assert_eq!(contained.line(), 19);
|
||||
assert_eq!(contained.line(), 17);
|
||||
assert_eq!(contained.column(), 5);
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
nightly-2020-06-30
|
||||
nightly-2020-07-02
|
||||
|
@ -37,7 +37,7 @@ pub(crate) fn fn_sig_for_fn_abi<'tcx>(tcx: TyCtxt<'tcx>, instance: Instance<'tcx
|
||||
|
||||
let env_ty = tcx.closure_env_ty(def_id, substs).unwrap();
|
||||
sig.map_bound(|sig| tcx.mk_fn_sig(
|
||||
std::iter::once(*env_ty.skip_binder()).chain(sig.inputs().iter().cloned()),
|
||||
std::iter::once(env_ty.skip_binder()).chain(sig.inputs().iter().cloned()),
|
||||
sig.output(),
|
||||
sig.c_variadic,
|
||||
sig.unsafety,
|
||||
|
Loading…
Reference in New Issue
Block a user