Skip to content

Commit 328e49c

Browse files
authored
Update toolchain to nightly-2022-11-06 (#1859)
1 parent 57305ce commit 328e49c

File tree

8 files changed

+8
-5
lines changed

8 files changed

+8
-5
lines changed

kani-compiler/src/codegen_cprover_gotoc/archive.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ impl ArchiveBuilderBuilder for ArArchiveBuilderBuilder {
160160
_lib_name: &str,
161161
_dll_imports: &[rustc_session::cstore::DllImport],
162162
_tmpdir: &Path,
163+
_is_direct_dependency: bool,
163164
) -> PathBuf {
164165
unimplemented!("injecting dll imports is not supported");
165166
}

kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ impl<'tcx> GotocCtx<'tcx> {
432432
pub fn is_unsized(&self, t: Ty<'tcx>) -> bool {
433433
!self
434434
.monomorphize(t)
435-
.is_sized(self.tcx.at(rustc_span::DUMMY_SP), ty::ParamEnv::reveal_all())
435+
.is_sized(*self.tcx.at(rustc_span::DUMMY_SP), ty::ParamEnv::reveal_all())
436436
}
437437

438438
/// Generates the type for a single field for a dynamic vtable.

kani-compiler/src/codegen_cprover_gotoc/compiler_interface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ fn check_options(session: &Session, need_metadata_module: bool) {
282282
fn check_crate_items(gcx: &GotocCtx) {
283283
let tcx = gcx.tcx;
284284
for item in tcx.hir_crate_items(()).items() {
285-
let def_id = item.def_id.to_def_id();
285+
let def_id = item.owner_id.def_id.to_def_id();
286286
gcx.check_attributes(def_id);
287287
if tcx.def_kind(def_id) == DefKind::GlobalAsm {
288288
if !gcx.queries.get_ignore_global_asm() {

kani-compiler/src/kani_middle/reachability.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ where
6565
tcx.hir_crate_items(())
6666
.items()
6767
.filter_map(|hir_id| {
68-
let def_id = hir_id.def_id.to_def_id();
68+
let def_id = hir_id.owner_id.def_id.to_def_id();
6969
filter(tcx, def_id).then(|| MonoItem::Fn(Instance::mono(tcx, def_id)))
7070
})
7171
.collect()

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: Apache-2.0 OR MIT
33

44
[toolchain]
5-
channel = "nightly-2022-10-24"
5+
channel = "nightly-2022-11-06"
66
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

tests/ui/code-location/expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module/mod.rs:10:5 in function module::not_empty
22
main.rs:13:5 in function same_file
33
/toolchains/
4-
alloc/src/vec/mod.rs:3028:81 in function <std::vec::Vec<i32> as std::ops::Drop>::drop
4+
alloc/src/vec/mod.rs:3029:81 in function <std::vec::Vec<i32> as std::ops::Drop>::drop
55

66
VERIFICATION:- SUCCESSFUL

tools/bookrunner/librustdoc/doctest.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ pub fn make_test(
8989
false,
9090
Some(80),
9191
false,
92+
false,
9293
)
9394
.supports_color();
9495

@@ -102,6 +103,7 @@ pub fn make_test(
102103
false,
103104
None,
104105
false,
106+
false,
105107
);
106108

107109
// FIXME(misdreavus): pass `-Z treat-err-as-bug` to the doctest parser

0 commit comments

Comments
 (0)