Update c2rust-refactor to nightly-2022-08-08 #1328
Open
+7,653
−9,121
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kkysen
reviewed
Aug 19, 2025
| @@ -135,7 +136,7 @@ impl<'c, 'lty, 'a: 'lty, 'tcx: 'a> IntraCtxt<'c, 'lty, 'a, 'tcx> { | |||
| }; | |||
|
|
|||
| let span = match &decl.local_info { | |||
| LocalInfo::User(ClearCrossCrate::Set(binding)) => Some(binding), | |||
| Some(box LocalInfo::User(ClearCrossCrate::Set(binding))) => Some(binding), | |||
There was a problem hiding this comment.
How come we're using the box keyword?
Comment on lines
+81
to
+83
| let (defaultness, generics, sig, body) = expect!([i.kind] | ||
| ItemKind::Fn(box Fn { defaultness, generics, sig, body }) | ||
| => (defaultness, generics, sig, body)); |
Comment on lines
115
to
+117
| // Don't keep the old tokens. The callback could have made arbitrary changes to | ||
| // the signature and body of the function. | ||
| tokens: None, | ||
| tokens: i.tokens.clone(), |
There was a problem hiding this comment.
Is this comment still up-to-date?
Comment on lines
+39
to
+44
| if let ItemKind::Mod(_, ModKind::Loaded(ref mut items_ref, ..)) = i { | ||
| let items = mem::replace(items_ref, vec![]); | ||
| let mut curs = Cursor::from_vec(items); | ||
| (self.f)(&mut curs); | ||
| *items_ref = curs.into_vec(); | ||
| } |
There was a problem hiding this comment.
What happened to the indentation here?
Also, I think you could use mem::take instead of mem::replace here. Or not, cause the old code didn't do that.
Comment on lines
+1
to
+7
| extern crate env_logger; | ||
| #[macro_use] | ||
| extern crate log; | ||
| #[macro_use] | ||
| extern crate clap; | ||
| extern crate c2rust_refactor; | ||
| extern crate shlex; |
There was a problem hiding this comment.
Shouldn't need any of these in Rust anymore.
Comment on lines
+522
to
+525
| let (path_qself, path_pattern) = match parse_path(&mut p) { | ||
| Some(p) => p, | ||
| None => return Err(Error::DefMismatch) | ||
| }; |
There was a problem hiding this comment.
Suggested change
| let (path_qself, path_pattern) = match parse_path(&mut p) { | |
| Some(p) => p, | |
| None => return Err(Error::DefMismatch) | |
| }; | |
| let (path_qself, path_pattern) = match parse_path(&mut p).ok_or(Error::DefMismatch)?; |
Comment on lines
537
to
+542
| if self.try_match(&path_pattern, &def_path).is_err() { | ||
| return Err(Error::DefMismatch); | ||
| } | ||
| if self.try_match(&path_qself, &def_qself).is_err() { | ||
| return Err(Error::DefMismatch); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if self.try_match(&path_pattern, &def_path).is_err() { | |
| return Err(Error::DefMismatch); | |
| } | |
| if self.try_match(&path_qself, &def_qself).is_err() { | |
| return Err(Error::DefMismatch); | |
| } | |
| self.try_match(&path_pattern, &def_path).map_err(|_| Error::DefMismatch)?; | |
| self.try_match(&path_qself, &def_qself).map_err(|_| Error::DefMismatch)?; |
Comment on lines
-49
to
+51
| !matches!([i.kind] ItemKind::Impl(_, _, _, _, None, _, _)) { | ||
| matches!(i.kind, ItemKind::Impl(box Impl { of_trait: None, .. })) { |
Comment on lines
+202
to
+208
| let (unsafety, polarity, generics, constness, | ||
| defaultness, of_trait, self_ty, mut items) = expect!([i.kind] ItemKind::Impl(box Impl { | ||
| unsafety, polarity, generics, constness, | ||
| defaultness, of_trait, self_ty, items | ||
| }) => (unsafety, polarity, generics, constness, | ||
| defaultness, of_trait, self_ty, items | ||
| )); |
There was a problem hiding this comment.
Would be nice to use let ... = i.kind else { panic!() } but I don't think that was in 1.65 yet.
| let unused = result | ||
| .unused_unsafes | ||
| .as_deref() | ||
| .unwrap_or_else(|| &[]) |
There was a problem hiding this comment.
Does .unwrap_or_default() work?
ahomescu
force-pushed
the
ahomescu/restore_refactor
branch
from
497f587 to
a0477c2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update the refactoring tool to build and run with the same Rust nightly as the transpiler.