On Mon, 2023-01-02 at 13:47 +0100, Arthur Cohen wrote: > Hi David, > > Sorry for the delayed reply! > > On 12/16/22 18:01, David Malcolm wrote: > > Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. > > > > OK for trunk? > > > > gcc/rust/ChangeLog: > > * resolve/rust-ast-resolve-item.cc > > (selftest::rust_flatten_list): > > Remove output to stderr.
For reference, the stderr spewage was: foo::bar::baz foo::bar::bul > > > > Signed-off-by: David Malcolm <dmalc...@redhat.com> > > --- > > gcc/rust/resolve/rust-ast-resolve-item.cc | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc > > b/gcc/rust/resolve/rust-ast-resolve-item.cc > > index 0c38f28d530..1276e845acc 100644 > > --- a/gcc/rust/resolve/rust-ast-resolve-item.cc > > +++ b/gcc/rust/resolve/rust-ast-resolve-item.cc > > @@ -1202,9 +1202,6 @@ rust_flatten_list (void) > > auto paths = std::vector<Rust::AST::SimplePath> (); > > Rust::Resolver::flatten_list (list, paths); > > > > - for (auto &path : paths) > > - fprintf (stderr, "%s\n", path.as_string ().c_str ()); > > - > > ASSERT_TRUE (!paths.empty ()); > > ASSERT_EQ (paths.size (), 2); > > ASSERT_EQ (paths[0].get_segments ()[0].as_string (), "foo"); > > Looks good to me. OK for trunk :) > > Thanks for taking the time! I was about to push this and https://gcc.gnu.org/pipermail/gcc-patches/2022-December/608645.html to trunk (after retesting against all the changes since before my break), but you mentioned today on IRC something about merger issues: <cohenarthur> ibuclaw: I'm looking at the remaining issues for updating GCC's master with our most recent gccrs commits. I've come to the conclusion that it would be easier for me to upstream your target changes while I'm upstreaming/submitting all of the missing commits <cohenarthur> would that suit you? <cohenarthur> it would just be me sending in your commits, but I wouldn't be author on them or anything of course <cohenarthur> this would enable us to time them properly within the rest of the commits, so there'd be no conflicts or anything of the sort <cohenarthur> dmalcolm: same question to you, actually :) Can I go ahead and push my two commits to trunk, or do you want to do it? (and if so, do you want them e.g. as PRs against your github branch?) Dave > > All the best,
