Increase verbosity when using update syntax with private fields #70331

jeremystucki · 2020-03-23T19:19:51Z

Resolves #70323

rust-highfive · 2020-03-23T19:19:54Z

(rust_highfive has picked a reviewer for you, use r? to override)

estebank · 2020-03-23T19:58:08Z

Can you run ./x.py fmt and squash? There's a missing comma that CI will reject:

Diff in /checkout/src/librustc_privacy/lib.rs at line 1023:
         span: Span,            // span of the field pattern, e.g., `x: 0`
         def: &'tcx ty::AdtDef, // definition of the struct or enum
         field: &'tcx ty::FieldDef,
-        in_update_syntax: bool
+        in_update_syntax: bool,
     ) {

Otherwise, LGTM.

estebank · 2020-03-23T19:58:40Z

src/librustc_privacy/lib.rs

@@ -1038,7 +1045,7 @@ impl<'a, 'tcx> NamePrivacyVisitor<'a, 'tcx> {
                def.variant_descr(),
                self.tcx.def_path_str(def.did)
            )
-            .span_label(span, "private field")
+            .span_label(span, label)


I thought span_label only took &str.

rust-highfive · 2020-03-23T21:05:00Z

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2020-03-23T19:20:29.3896925Z ========================== Starting Command Output ===========================
2020-03-23T19:20:29.3899419Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/60657d4b-14e8-44ca-a740-05a6a9ae3f0d.sh
2020-03-23T19:20:29.3899714Z 
2020-03-23T19:20:29.3903435Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-23T19:20:29.3922688Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70331/merge to s
2020-03-23T19:20:29.3925903Z Task         : Get sources
2020-03-23T19:20:29.3926215Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-23T19:20:29.3926528Z Version      : 1.0.0
2020-03-23T19:20:29.3926729Z Author       : Microsoft
---
2020-03-23T19:20:30.3898782Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-23T19:20:30.3904165Z ##[command]git config gc.auto 0
2020-03-23T19:20:30.3907788Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-23T19:20:30.3911143Z ##[command]git config --get-all http.proxy
2020-03-23T19:20:30.3917154Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70331/merge:refs/remotes/pull/70331/merge
---
2020-03-23T19:28:36.2729436Z configure: build.locked-deps    := True
2020-03-23T19:28:36.2730308Z configure: llvm.ccache          := sccache
2020-03-23T19:28:36.2730847Z configure: build.cargo-native-static := True
2020-03-23T19:28:36.2731318Z configure: dist.missing-tools   := True
2020-03-23T19:28:36.2731919Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2020-03-23T19:28:36.2732467Z configure: writing `config.toml` in current directory
2020-03-23T19:28:36.2733063Z configure: 
2020-03-23T19:28:36.2733816Z configure: run `python /checkout/x.py --help`
2020-03-23T19:28:36.2734054Z configure: 
---
2020-03-23T19:35:55.8278466Z skip untracked path cpu-usage.csv during rustfmt invocations
2020-03-23T19:35:55.8282864Z skip untracked path src/doc/book/ during rustfmt invocations
2020-03-23T19:35:55.8287047Z skip untracked path src/doc/rust-by-example/ during rustfmt invocations
2020-03-23T19:35:55.8291706Z skip untracked path src/llvm-project/ during rustfmt invocations
2020-03-23T19:35:56.6638507Z Diff in /checkout/src/librustc_privacy/lib.rs at line 1023:
2020-03-23T19:35:56.6638999Z          span: Span,            // span of the field pattern, e.g., `x: 0`
2020-03-23T19:35:56.6640165Z          def: &'tcx ty::AdtDef, // definition of the struct or enum
2020-03-23T19:35:56.6640683Z          field: &'tcx ty::FieldDef,
2020-03-23T19:35:56.6641104Z -        in_update_syntax: bool
2020-03-23T19:35:56.6641757Z +        in_update_syntax: bool,
2020-03-23T19:35:56.6642148Z          // definition of the field
2020-03-23T19:35:56.6642148Z          // definition of the field
2020-03-23T19:35:56.6642459Z          let ident = Ident::new(kw::Invalid, use_ctxt);
2020-03-23T19:35:56.6662712Z Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustfmt" "--config-path" "/checkout" "--edition" "2018" "--unstable-features" "--skip-children" "--check" "/checkout/src/librustc_privacy/lib.rs"` failed.
2020-03-23T19:35:56.6663736Z If you're running `tidy`, try again with `--bless` flag. Or, you just want to format code, run `./x.py fmt` instead.
2020-03-23T19:35:56.6664609Z Build completed unsuccessfully in 0:00:35
2020-03-23T19:35:56.6713807Z == clock drift check ==
2020-03-23T19:35:56.6726867Z   local time: Mon Mar 23 19:35:56 UTC 2020
2020-03-23T19:35:56.7643387Z   network time: Mon, 23 Mar 2020 19:35:56 GMT
2020-03-23T19:35:56.7643387Z   network time: Mon, 23 Mar 2020 19:35:56 GMT
2020-03-23T19:35:56.7659719Z == end clock drift check ==
2020-03-23T19:35:58.3248353Z 
2020-03-23T19:35:58.3315662Z ##[error]Bash exited with code '1'.
2020-03-23T19:35:58.3329295Z ##[section]Finishing: Run build
2020-03-23T19:35:58.3375213Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70331/merge to s
2020-03-23T19:35:58.3380002Z Task         : Get sources
2020-03-23T19:35:58.3380352Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-23T19:35:58.3380681Z Version      : 1.0.0
2020-03-23T19:35:58.3380928Z Author       : Microsoft
2020-03-23T19:35:58.3380928Z Author       : Microsoft
2020-03-23T19:35:58.3381291Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-23T19:35:58.3381707Z ==============================================================================
2020-03-23T19:35:58.6710627Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-03-23T19:35:58.6753759Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70331/merge to s
2020-03-23T19:35:58.6928875Z Cleaning up task key
2020-03-23T19:35:58.6930075Z Start cleaning up orphan processes.
2020-03-23T19:35:58.7099130Z Terminate orphan process: pid (3667) (python)
2020-03-23T19:35:58.7267273Z ##[section]Finishing: Finalize Job

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

jeremystucki · 2020-03-24T18:29:34Z

Can you run ./x.py fmt and squash? There's a missing comma that CI will reject:

Sorry about that

estebank · 2020-03-25T01:02:21Z

@bors r+

bors · 2020-03-25T01:02:22Z

📌 Commit 17b97ee has been approved by estebank

Increase verbosity when using update syntax with private fields Resolves rust-lang#70323

bors · 2020-03-25T05:46:04Z

⌛ Testing commit 17b97ee with merge 3abeeca22d8d17699eb4a8abbde2222c8fd8ff3f...

Centril · 2020-03-25T05:46:37Z

@bors retry

@ghost

Rollup of 7 pull requests Successful merges: - rust-lang#70331 (Increase verbosity when using update syntax with private fields) - rust-lang#70349 (move `hir_id_validation` to `rustc_passes` + simplify `hir::map` code) - rust-lang#70361 (Update backtrace crate to 0.3.46) - rust-lang#70364 (resolve: Remove `rustc_attrs` as a standalone feature gate) - rust-lang#70369 (Fix smaller issues with invalid placeholder type errors) - rust-lang#70373 (normalize some imports & prefer direct ones) - rust-lang#70376 (Add test for rust-lang#66312) Failed merges: r? @ghost

bors · 2020-03-25T09:03:50Z

⌛ Testing commit 17b97ee with merge cdb50c6...

Increase verbosity when using update syntax

3a65d38

rust-highfive assigned estebank Mar 23, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 23, 2020

estebank reviewed Mar 23, 2020

View reviewed changes

fmt

17b97ee

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 25, 2020

Centril added a commit to Centril/rust that referenced this pull request Mar 25, 2020

Rollup merge of rust-lang#70331 - jeremystucki:privacy, r=estebank

06ef0b8

Increase verbosity when using update syntax with private fields Resolves rust-lang#70323

Centril mentioned this pull request Mar 25, 2020

Rollup of 6 pull requests #70378

Closed

Centril mentioned this pull request Mar 25, 2020

Rollup of 7 pull requests #70383

Merged

bors merged commit d03c02a into rust-lang:master Mar 25, 2020

jeremystucki deleted the privacy branch March 25, 2020 09:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Increase verbosity when using update syntax with private fields #70331

Increase verbosity when using update syntax with private fields #70331

jeremystucki commented Mar 23, 2020

rust-highfive commented Mar 23, 2020

estebank commented Mar 23, 2020

estebank Mar 23, 2020

rust-highfive commented Mar 23, 2020

jeremystucki commented Mar 24, 2020

estebank commented Mar 25, 2020

bors commented Mar 25, 2020

bors commented Mar 25, 2020

Centril commented Mar 25, 2020

bors commented Mar 25, 2020

Increase verbosity when using update syntax with private fields #70331

Increase verbosity when using update syntax with private fields #70331

Conversation

jeremystucki commented Mar 23, 2020

rust-highfive commented Mar 23, 2020

estebank commented Mar 23, 2020

estebank Mar 23, 2020

Choose a reason for hiding this comment

rust-highfive commented Mar 23, 2020

jeremystucki commented Mar 24, 2020

estebank commented Mar 25, 2020

bors commented Mar 25, 2020

bors commented Mar 25, 2020

Centril commented Mar 25, 2020

bors commented Mar 25, 2020