Skip to content

Commit 221fe3b

Browse files
rahulkurahulku
and
rahulku
authored
Update rust toolchain to nightly 1.66.0-nightly (rust-lang#1804)
* update rust toolchain to nightly 1.66.0-nightly * move to code block instead of escaping * fix missing quote * disable clippy check: clippy::uninlined-format-args Co-authored-by: rahulku <luhark@a07817b4397e.ant.amazon.com>
1 parent 88859d8 commit 221fe3b

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

Diff for: .cargo/config.toml

+1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ rustflags = [ # Global lints/warnings. Need to use underscore instead of -.
3232
# New lints that we are not compliant yet
3333
"-Aclippy::needless-borrow",
3434
"-Aclippy::bool-to-int-with-if",
35+
"-Aclippy::uninlined-format-args",
3536
]

Diff for: kani-compiler/src/codegen_cprover_gotoc/codegen/typ.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,10 @@ impl<'tcx> GotocCtx<'tcx> {
506506
self.codegen_ty(typ).to_pointer()
507507
}
508508

509-
/// A reference to a Struct<dyn T> { .., data: T} is translated to
509+
/// A reference to a `Struct<dyn T>` { .., data: T} is translated to
510510
/// struct RefToTrait {
511-
/// Struct<dyn T>* data;
512-
/// Metadata<dyn T>* vtable;
511+
/// `Struct<dyn T>* data`;
512+
/// `Metadata<dyn T>* vtable;`
513513
/// }
514514
/// Note: T is a `typedef` but data represents the space in memory occupied by
515515
/// the concrete type. We just don't know its size during compilation time.
@@ -1264,8 +1264,8 @@ impl<'tcx> GotocCtx<'tcx> {
12641264
/// Dynamic function calls first parameter is self which must be one of the following:
12651265
///
12661266
/// As of Jul 2022:
1267-
/// P = &Self | &mut Self | Box<Self> | Rc<Self> | Arc<Self>
1268-
/// S = P | Pin<P>
1267+
/// `P = &Self | &mut Self | Box<Self> | Rc<Self> | Arc<Self>`
1268+
/// `S = P | Pin<P>`
12691269
///
12701270
/// See <https://doc.rust-lang.org/reference/items/traits.html#object-safety> for more details.
12711271
fn codegen_dynamic_function_sig(&mut self, sig: PolyFnSig<'tcx>) -> Type {

Diff for: kani-compiler/src/codegen_cprover_gotoc/utils/names.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ impl<'tcx> GotocCtx<'tcx> {
112112
}
113113

114114
/// Add a prefix of the form:
115-
/// \[<prefix>\]
115+
/// \[`<prefix>`\]
116116
/// to the provided message
117117
pub fn add_prefix_to_msg(msg: &str, prefix: &str) -> String {
118118
format!("[{}] {}", prefix, msg)
119119
}
120120

121121
/// Generate a message for the reachability check of an assert with ID
122122
/// `check_id`. The message is of the form:
123-
/// \[KANI_REACHABILITY_CHECK\] <ID of assert>
123+
/// \[KANI_REACHABILITY_CHECK\] `<ID of assert>`
124124
/// The check_id is generated using the GotocCtx::next_check_id method and
125125
/// is a unique string identifier for that check.
126126
pub fn reachability_check_message(check_id: &str) -> String {

Diff for: kani-compiler/src/codegen_cprover_gotoc/utils/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl<'tcx> GotocCtx<'tcx> {
9090
RAW_PTR_FROM_BOX.iter().fold(box_expr, |expr, name| expr.member(name, &self.symbol_table))
9191
}
9292

93-
/// Box<T> initializer
93+
/// `Box<T>` initializer
9494
///
9595
/// Traverse over the Box representation and only initialize the raw_ptr field. All other
9696
/// members are left uninitialized.
@@ -177,7 +177,7 @@ impl<'tcx> GotocCtx<'tcx> {
177177
}
178178
}
179179

180-
/// Best effort check if the struct represents a std::ptr::NonNull<T>.
180+
/// Best effort check if the struct represents a `std::ptr::NonNull<T>`.
181181
///
182182
/// This assumes the following structure. Any changes to this will break this code.
183183
/// ```

Diff for: rust-toolchain.toml

+2-2
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-11"
6-
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]
5+
channel = "nightly-2022-10-25"
6+
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

Diff for: scripts/kani-regression.sh

-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ for testp in "${TESTS[@]}"; do
7070
suite=${testl[0]}
7171
mode=${testl[1]}
7272
echo "Check compiletest suite=$suite mode=$mode"
73-
# Note: `cargo-kani` tests fail if we do not add `$(pwd)` to `--build-base`
74-
# Tracking issue: https://github.com/model-checking/kani/issues/755
7573
cargo run -p compiletest --quiet -- --suite $suite --mode $mode --quiet
7674
done
7775

Diff for: tests/ui/code-location/expected

+1-1
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:3031:81 in function <std::vec::Vec<i32> as std::ops::Drop>::drop
4+
alloc/src/vec/mod.rs:3028:81 in function <std::vec::Vec<i32> as std::ops::Drop>::drop
55

66
VERIFICATION:- SUCCESSFUL

0 commit comments

Comments
 (0)