Conservatively report "not sure" in cfg_accessible

Urgau · Urgau · commit b76d1125d4f1 · 2022-06-03T11:31:11.000+02:00
diff --git a/compiler/rustc_resolve/src/macros.rs b/compiler/rustc_resolve/src/macros.rs
@@ -443,7 +443,9 @@ impl<'a> ResolverExpand for Resolver<'a> {
                 PathResult::NonModule(partial_res) if partial_res.unresolved_segments() == 0 => {
                     return Ok(true);
                 }
-                PathResult::NonModule(..) => {
+                PathResult::NonModule(..) |
+                // HACK(Urgau): This shouldn't be necessary
+                PathResult::Failed { is_error_from_last_segment: false, .. } => {
                     self.session
                         .struct_span_err(span, "not sure whether the path is accessible or not")
                         .note("the type may have associated items, but we are currently not checking them")
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-bugs.rs b/src/test/ui/conditional-compilation/cfg_accessible-bugs.rs
@@ -5,20 +5,8 @@
 #![feature(cfg_accessible)]
 #![feature(trait_alias)]
 
-enum Enum {
-    Existing { existing: u8 },
-}
-
 trait TraitAlias = std::fmt::Debug + Send;
 
-// FIXME: Currently returns `false` but should be "not sure"
-#[cfg_accessible(Enum::Existing::existing)]
-const A: bool = true;
-
-// FIXME: Currently returns `false` but should be "not sure"
-#[cfg_accessible(Enum::Existing::unresolved)]
-const B: bool = true;
-
 // FIXME: Currently shows "cannot determine" but should be `false`
 #[cfg_accessible(unresolved)] //~ ERROR cannot determine
 const C: bool = true;
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-bugs.stderr b/src/test/ui/conditional-compilation/cfg_accessible-bugs.stderr
@@ -1,13 +1,13 @@
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-bugs.rs:28:18
+  --> $DIR/cfg_accessible-bugs.rs:15:18
    |
 LL | #[cfg_accessible(TraitAlias::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: cannot determine whether the path is accessible or not
-  --> $DIR/cfg_accessible-bugs.rs:24:1
+  --> $DIR/cfg_accessible-bugs.rs:11:1
    |
 LL | #[cfg_accessible(unresolved)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.edition2015.stderr b/src/test/ui/conditional-compilation/cfg_accessible-not_sure.edition2015.stderr
@@ -33,74 +33,90 @@ LL | #[cfg_accessible(Union::unresolved)]
 error: not sure whether the path is accessible or not
   --> $DIR/cfg_accessible-not_sure.rs:36:18
    |
+LL | #[cfg_accessible(Enum::Existing::existing)]
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the type may have associated items, but we are currently not checking them
+
+error: not sure whether the path is accessible or not
+  --> $DIR/cfg_accessible-not_sure.rs:38:18
+   |
+LL | #[cfg_accessible(Enum::Existing::unresolved)]
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the type may have associated items, but we are currently not checking them
+
+error: not sure whether the path is accessible or not
+  --> $DIR/cfg_accessible-not_sure.rs:40:18
+   |
 LL | #[cfg_accessible(Enum::unresolved)]
    |                  ^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:46:18
+  --> $DIR/cfg_accessible-not_sure.rs:50:18
    |
 LL | #[cfg_accessible(Trait::existing)]
    |                  ^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:48:18
+  --> $DIR/cfg_accessible-not_sure.rs:52:18
    |
 LL | #[cfg_accessible(Trait::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:55:18
+  --> $DIR/cfg_accessible-not_sure.rs:59:18
    |
 LL | #[cfg_accessible(TypeAlias::existing)]
    |                  ^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:57:18
+  --> $DIR/cfg_accessible-not_sure.rs:61:18
    |
 LL | #[cfg_accessible(TypeAlias::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:66:18
+  --> $DIR/cfg_accessible-not_sure.rs:70:18
    |
 LL | #[cfg_accessible(ForeignType::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:75:18
+  --> $DIR/cfg_accessible-not_sure.rs:79:18
    |
 LL | #[cfg_accessible(AssocType::AssocType::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:80:18
+  --> $DIR/cfg_accessible-not_sure.rs:84:18
    |
 LL | #[cfg_accessible(u8::unresolved)]
    |                  ^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:82:18
+  --> $DIR/cfg_accessible-not_sure.rs:86:18
    |
 LL | #[cfg_accessible(u8::is_ascii)]
    |                  ^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
-error: aborting due to 13 previous errors
+error: aborting due to 15 previous errors
 
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.edition2021.stderr b/src/test/ui/conditional-compilation/cfg_accessible-not_sure.edition2021.stderr
@@ -33,74 +33,90 @@ LL | #[cfg_accessible(Union::unresolved)]
 error: not sure whether the path is accessible or not
   --> $DIR/cfg_accessible-not_sure.rs:36:18
    |
+LL | #[cfg_accessible(Enum::Existing::existing)]
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the type may have associated items, but we are currently not checking them
+
+error: not sure whether the path is accessible or not
+  --> $DIR/cfg_accessible-not_sure.rs:38:18
+   |
+LL | #[cfg_accessible(Enum::Existing::unresolved)]
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the type may have associated items, but we are currently not checking them
+
+error: not sure whether the path is accessible or not
+  --> $DIR/cfg_accessible-not_sure.rs:40:18
+   |
 LL | #[cfg_accessible(Enum::unresolved)]
    |                  ^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:46:18
+  --> $DIR/cfg_accessible-not_sure.rs:50:18
    |
 LL | #[cfg_accessible(Trait::existing)]
    |                  ^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:48:18
+  --> $DIR/cfg_accessible-not_sure.rs:52:18
    |
 LL | #[cfg_accessible(Trait::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:55:18
+  --> $DIR/cfg_accessible-not_sure.rs:59:18
    |
 LL | #[cfg_accessible(TypeAlias::existing)]
    |                  ^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:57:18
+  --> $DIR/cfg_accessible-not_sure.rs:61:18
    |
 LL | #[cfg_accessible(TypeAlias::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:66:18
+  --> $DIR/cfg_accessible-not_sure.rs:70:18
    |
 LL | #[cfg_accessible(ForeignType::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:75:18
+  --> $DIR/cfg_accessible-not_sure.rs:79:18
    |
 LL | #[cfg_accessible(AssocType::AssocType::unresolved)]
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:80:18
+  --> $DIR/cfg_accessible-not_sure.rs:84:18
    |
 LL | #[cfg_accessible(u8::unresolved)]
    |                  ^^^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
 error: not sure whether the path is accessible or not
-  --> $DIR/cfg_accessible-not_sure.rs:82:18
+  --> $DIR/cfg_accessible-not_sure.rs:86:18
    |
 LL | #[cfg_accessible(u8::is_ascii)]
    |                  ^^^^^^^^^^^^
    |
    = note: the type may have associated items, but we are currently not checking them
 
-error: aborting due to 13 previous errors
+error: aborting due to 15 previous errors
 
diff --git a/src/test/ui/conditional-compilation/cfg_accessible-not_sure.rs b/src/test/ui/conditional-compilation/cfg_accessible-not_sure.rs
@@ -33,6 +33,10 @@ enum Enum {
     Existing { existing: u8 },
 }
 
+#[cfg_accessible(Enum::Existing::existing)] //~ ERROR not sure
+const A: bool = true;
+#[cfg_accessible(Enum::Existing::unresolved)] //~ ERROR not sure
+const B: bool = true;
 #[cfg_accessible(Enum::unresolved)] //~ ERROR not sure
 const C: bool = true;
 

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`error: not sure whether the path is accessible or not`
`2`		`- --> $DIR/cfg_accessible-bugs.rs:28:18`
	`2`	`+ --> $DIR/cfg_accessible-bugs.rs:15:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[cfg_accessible(TraitAlias::unresolved)]`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	`= note: the type may have associated items, but we are currently not checking them`
`8`	`8`
`9`	`9`	`error: cannot determine whether the path is accessible or not`
`10`		`- --> $DIR/cfg_accessible-bugs.rs:24:1`
	`10`	`+ --> $DIR/cfg_accessible-bugs.rs:11:1`
`11`	`11`	`\|`
`12`	`12`	`LL \| #[cfg_accessible(unresolved)]`
`13`	`13`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -33,74 +33,90 @@ LL \| #[cfg_accessible(Union::unresolved)]`
`33`	`33`	`error: not sure whether the path is accessible or not`
`34`	`34`	`--> $DIR/cfg_accessible-not_sure.rs:36:18`
`35`	`35`	`\|`
	`36`	`+LL \| #[cfg_accessible(Enum::Existing::existing)]`
	`37`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^`
	`38`	`+ \|`
	`39`	`+ = note: the type may have associated items, but we are currently not checking them`
	`40`	`+`
	`41`	`+error: not sure whether the path is accessible or not`
	`42`	`+ --> $DIR/cfg_accessible-not_sure.rs:38:18`
	`43`	`+ \|`
	`44`	`+LL \| #[cfg_accessible(Enum::Existing::unresolved)]`
	`45`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`46`	`+ \|`
	`47`	`+ = note: the type may have associated items, but we are currently not checking them`
	`48`	`+`
	`49`	`+error: not sure whether the path is accessible or not`
	`50`	`+ --> $DIR/cfg_accessible-not_sure.rs:40:18`
	`51`	`+ \|`
`36`	`52`	`LL \| #[cfg_accessible(Enum::unresolved)]`
`37`	`53`	`\| ^^^^^^^^^^^^^^^^`
`38`	`54`	`\|`
`39`	`55`	`= note: the type may have associated items, but we are currently not checking them`
`40`	`56`
`41`	`57`	`error: not sure whether the path is accessible or not`
`42`		`- --> $DIR/cfg_accessible-not_sure.rs:46:18`
	`58`	`+ --> $DIR/cfg_accessible-not_sure.rs:50:18`
`43`	`59`	`\|`
`44`	`60`	`LL \| #[cfg_accessible(Trait::existing)]`
`45`	`61`	`\| ^^^^^^^^^^^^^^^`
`46`	`62`	`\|`
`47`	`63`	`= note: the type may have associated items, but we are currently not checking them`
`48`	`64`
`49`	`65`	`error: not sure whether the path is accessible or not`
`50`		`- --> $DIR/cfg_accessible-not_sure.rs:48:18`
	`66`	`+ --> $DIR/cfg_accessible-not_sure.rs:52:18`
`51`	`67`	`\|`
`52`	`68`	`LL \| #[cfg_accessible(Trait::unresolved)]`
`53`	`69`	`\| ^^^^^^^^^^^^^^^^^`
`54`	`70`	`\|`
`55`	`71`	`= note: the type may have associated items, but we are currently not checking them`
`56`	`72`
`57`	`73`	`error: not sure whether the path is accessible or not`
`58`		`- --> $DIR/cfg_accessible-not_sure.rs:55:18`
	`74`	`+ --> $DIR/cfg_accessible-not_sure.rs:59:18`
`59`	`75`	`\|`
`60`	`76`	`LL \| #[cfg_accessible(TypeAlias::existing)]`
`61`	`77`	`\| ^^^^^^^^^^^^^^^^^^^`
`62`	`78`	`\|`
`63`	`79`	`= note: the type may have associated items, but we are currently not checking them`
`64`	`80`
`65`	`81`	`error: not sure whether the path is accessible or not`
`66`		`- --> $DIR/cfg_accessible-not_sure.rs:57:18`
	`82`	`+ --> $DIR/cfg_accessible-not_sure.rs:61:18`
`67`	`83`	`\|`
`68`	`84`	`LL \| #[cfg_accessible(TypeAlias::unresolved)]`
`69`	`85`	`\| ^^^^^^^^^^^^^^^^^^^^^`
`70`	`86`	`\|`
`71`	`87`	`= note: the type may have associated items, but we are currently not checking them`
`72`	`88`
`73`	`89`	`error: not sure whether the path is accessible or not`
`74`		`- --> $DIR/cfg_accessible-not_sure.rs:66:18`
	`90`	`+ --> $DIR/cfg_accessible-not_sure.rs:70:18`
`75`	`91`	`\|`
`76`	`92`	`LL \| #[cfg_accessible(ForeignType::unresolved)]`
`77`	`93`	`\| ^^^^^^^^^^^^^^^^^^^^^^^`
`78`	`94`	`\|`
`79`	`95`	`= note: the type may have associated items, but we are currently not checking them`
`80`	`96`
`81`	`97`	`error: not sure whether the path is accessible or not`
`82`		`- --> $DIR/cfg_accessible-not_sure.rs:75:18`
	`98`	`+ --> $DIR/cfg_accessible-not_sure.rs:79:18`
`83`	`99`	`\|`
`84`	`100`	`LL \| #[cfg_accessible(AssocType::AssocType::unresolved)]`
`85`	`101`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`86`	`102`	`\|`
`87`	`103`	`= note: the type may have associated items, but we are currently not checking them`
`88`	`104`
`89`	`105`	`error: not sure whether the path is accessible or not`
`90`		`- --> $DIR/cfg_accessible-not_sure.rs:80:18`
	`106`	`+ --> $DIR/cfg_accessible-not_sure.rs:84:18`
`91`	`107`	`\|`
`92`	`108`	`LL \| #[cfg_accessible(u8::unresolved)]`
`93`	`109`	`\| ^^^^^^^^^^^^^^`
`94`	`110`	`\|`
`95`	`111`	`= note: the type may have associated items, but we are currently not checking them`
`96`	`112`
`97`	`113`	`error: not sure whether the path is accessible or not`
`98`		`- --> $DIR/cfg_accessible-not_sure.rs:82:18`
	`114`	`+ --> $DIR/cfg_accessible-not_sure.rs:86:18`
`99`	`115`	`\|`
`100`	`116`	`LL \| #[cfg_accessible(u8::is_ascii)]`
`101`	`117`	`\| ^^^^^^^^^^^^`
`102`	`118`	`\|`
`103`	`119`	`= note: the type may have associated items, but we are currently not checking them`
`104`	`120`
`105`		`-error: aborting due to 13 previous errors`
	`121`	`+error: aborting due to 15 previous errors`
`106`	`122`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,10 @@ enum Enum {`
`33`	`33`	`Existing { existing: u8 },`
`34`	`34`	`}`
`35`	`35`
	`36`	`+#[cfg_accessible(Enum::Existing::existing)] //~ ERROR not sure`
	`37`	`+const A: bool = true;`
	`38`	`+#[cfg_accessible(Enum::Existing::unresolved)] //~ ERROR not sure`
	`39`	`+const B: bool = true;`
`36`	`40`	`#[cfg_accessible(Enum::unresolved)] //~ ERROR not sure`
`37`	`41`	`const C: bool = true;`
`38`	`42`