Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rustc version incrementally to nightly-2022-12-06 #811

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
867db8b
Updated to `nightly-2022-08-22`, the latest version not requiring any…
kkysen Jan 4, 2023
74f703f
Used `Default::default()` instead of `Vec::new()` so that `ThinVec::n…
kkysen Jan 4, 2023
9416506
Updated to `nightly-2022-08-23` after the `Vec::new()` => `Default::d…
kkysen Jan 4, 2023
9f4e406
Updated to `nightly-2022-08-29`, the latest version not requiring any…
kkysen Jan 4, 2023
a2738de
Updated to `nightly-2022-09-30`, changing `.basic_blocks()` => `.basi…
kkysen Jan 4, 2023
de457a9
Updated to `nightly-2022-09-08`, changing `StatementKind::{CopyNonOve…
kkysen Jan 4, 2023
23d9928
`cargo clippy --fix` after the update to `nightly-2022-09-08`.
kkysen Jan 4, 2023
848a7e9
Updated to `nightly-2022-09-17`, the latest version not requiring an…
kkysen Jan 4, 2023
bf95e95
`cargo clippy --fix && cargo fmt` after the update to `nightly-2022-0…
kkysen Jan 5, 2023
4a740ab
In `c2rust_instrument::into_operand::make_const`, use `ConstantKind::…
kkysen Jan 5, 2023
76be307
Updated to `nightly-2022-09-19`, which seems to change the PDG by eli…
kkysen Jan 5, 2023
674d0e2
Updated to `nightly-2022-09-21`, adding a `match` arm for `Projection…
kkysen Jan 5, 2023
5ea3998
Updated to `nightly-2022-10-08`, the latest version not requiring any…
kkysen Jan 5, 2023
6ede894
`cargo clippy --fix` after the update to `nightly-2022-10-08`.
kkysen Jan 5, 2023
78d36f2
Trivial `clippy` fixes after the update to `nightly-2022-10-08`.
kkysen Jan 5, 2023
7fd06e3
Updated to `nightly-2022-10-09`, changing `CastKind{Misc => PtrToPtr}…
kkysen Jan 5, 2023
9e6a899
Updated to `nightly-2022-12-06`, the latest version not requiring any…
kkysen Jan 5, 2023
3bb66d6
`cargo clippy --fix && cargo fmt` after the update to `nightly-2022-1…
kkysen Jan 5, 2023
d835ba6
Trivial `clippy` fixes after the update to `nightly-2022-12-06`.
kkysen Jan 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Trivial clippy fixes after the update to nightly-2022-10-08.
  • Loading branch information
kkysen committed Feb 1, 2023
commit 78d36f20d04cdd82f4ef29a39a01aa0de88039dc
4 changes: 2 additions & 2 deletions c2rust-ast-exporter/build.rs
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ fn generate_bindings() -> Result<(), &'static str> {
.clang_arg("-xc++")
// Finish the builder and generate the bindings.
.generate()
.or(Err("Unable to generate AST bindings"))?;
.map_err(|_| "Unable to generate AST bindings")?;

let cppbindings = bindgen::Builder::default()
.header("src/ExportResult.hpp")
@@ -95,7 +95,7 @@ fn generate_bindings() -> Result<(), &'static str> {
.clang_arg("-std=c++11")
// Finish the builder and generate the bindings.
.generate()
.or(Err("Unable to generate ExportResult bindings"))?;
.map_err(|_| "Unable to generate ExportResult bindings")?;

// Write the bindings to the $OUT_DIR/bindings.rs file.
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
2 changes: 1 addition & 1 deletion c2rust-transpile/src/translator/atomics.rs
Original file line number Diff line number Diff line change
@@ -318,7 +318,7 @@ impl<'c> Translation<'c> {
// Emit `atomic_cxchg(a0, a1, a2).idx`
let atomic_cxchg = mk().abs_path_expr(vec!["core", "intrinsics", intrinsic_name]);
let call = mk().call_expr(atomic_cxchg, vec![dst, old_val, src_val]);
let field_idx = if returns_val { 0 } else { 1 };
let field_idx = (!returns_val).into();
let call_expr = mk().anon_field_expr(call, field_idx);
self.convert_side_effects_expr(
ctx,