Update toolchain to nightly-2022-11-06 (rust-lang#1859)

celinval · Nov 8, 2022 · 328e49c · 328e49c
1 parent 57305ce
commit 328e49c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 5 deletions.
diff --git a/kani-compiler/src/codegen_cprover_gotoc/archive.rs b/kani-compiler/src/codegen_cprover_gotoc/archive.rs
@@ -160,6 +160,7 @@ impl ArchiveBuilderBuilder for ArArchiveBuilderBuilder {
         _lib_name: &str,
         _dll_imports: &[rustc_session::cstore::DllImport],
         _tmpdir: &Path,
+        _is_direct_dependency: bool,
     ) -> PathBuf {
         unimplemented!("injecting dll imports is not supported");
     }

diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs
@@ -432,7 +432,7 @@ impl<'tcx> GotocCtx<'tcx> {
     pub fn is_unsized(&self, t: Ty<'tcx>) -> bool {
         !self
             .monomorphize(t)
-            .is_sized(self.tcx.at(rustc_span::DUMMY_SP), ty::ParamEnv::reveal_all())
+            .is_sized(*self.tcx.at(rustc_span::DUMMY_SP), ty::ParamEnv::reveal_all())
     }
 
     /// Generates the type for a single field for a dynamic vtable.

diff --git a/kani-compiler/src/codegen_cprover_gotoc/compiler_interface.rs b/kani-compiler/src/codegen_cprover_gotoc/compiler_interface.rs
@@ -282,7 +282,7 @@ fn check_options(session: &Session, need_metadata_module: bool) {
 fn check_crate_items(gcx: &GotocCtx) {
     let tcx = gcx.tcx;
     for item in tcx.hir_crate_items(()).items() {
-        let def_id = item.def_id.to_def_id();
+        let def_id = item.owner_id.def_id.to_def_id();
         gcx.check_attributes(def_id);
         if tcx.def_kind(def_id) == DefKind::GlobalAsm {
             if !gcx.queries.get_ignore_global_asm() {

diff --git a/kani-compiler/src/kani_middle/reachability.rs b/kani-compiler/src/kani_middle/reachability.rs
@@ -65,7 +65,7 @@ where
     tcx.hir_crate_items(())
         .items()
         .filter_map(|hir_id| {
-            let def_id = hir_id.def_id.to_def_id();
+            let def_id = hir_id.owner_id.def_id.to_def_id();
             filter(tcx, def_id).then(|| MonoItem::Fn(Instance::mono(tcx, def_id)))
         })
         .collect()

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2022-10-24"
+channel = "nightly-2022-11-06"
 components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]
diff --git a/tests/kani/ConstEval/limit.rs → tests/kani/ConstEval/limit_fixme.rs b/tests/kani/ConstEval/limit.rs → tests/kani/ConstEval/limit_fixme.rs
diff --git a/tests/ui/code-location/expected b/tests/ui/code-location/expected
@@ -1,6 +1,6 @@
 module/mod.rs:10:5 in function module::not_empty
 main.rs:13:5 in function same_file
 /toolchains/
-alloc/src/vec/mod.rs:3028:81 in function <std::vec::Vec<i32> as std::ops::Drop>::drop
+alloc/src/vec/mod.rs:3029:81 in function <std::vec::Vec<i32> as std::ops::Drop>::drop
 
 VERIFICATION:- SUCCESSFUL
diff --git a/tools/bookrunner/librustdoc/doctest.rs b/tools/bookrunner/librustdoc/doctest.rs
@@ -89,6 +89,7 @@ pub fn make_test(
                 false,
                 Some(80),
                 false,
+                false,
             )
             .supports_color();
 
@@ -102,6 +103,7 @@ pub fn make_test(
                 false,
                 None,
                 false,
+                false,
             );
 
             // FIXME(misdreavus): pass `-Z treat-err-as-bug` to the doctest parser