diff --git a/CHANGELOG.md b/CHANGELOG.md
index 937cd84ce..be72c7bbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Fixed
+- [PR#626](https://github.com/EmbarkStudios/cargo-deny/pull/626) resolved [#625](https://github.com/EmbarkStudios/cargo-deny/issues/625) by explicitly checking that a license identified as Pixar was actually (probably) the Pixar license, instead of a normal Apache-2.0 license.
+
 ## [0.14.15] - 2024-02-28
 ### Added
 - [PR#618](https://github.com/EmbarkStudios/cargo-deny/pull/618) added metadata notes to diagnostics when a license is rejected, as well as removing span information for accepted licenses unless the log level is `info` or higher to make the diagnostic clearer by default.
diff --git a/src/licenses.rs b/src/licenses.rs
index b9c378684..3682d15c4 100644
--- a/src/licenses.rs
+++ b/src/licenses.rs
@@ -230,7 +230,7 @@ fn evaluate_expression(
         ),
     );
 
-    let mut notes = Vec::new();
+    let mut notes = krate_lic_nfo.notes.clone();
 
     for ((reason, accepted), failed_req) in reasons.into_iter().zip(expr.requirements()) {
         if accepted && ctx.log_level < log::LevelFilter::Info {
@@ -241,6 +241,8 @@ fn evaluate_expression(
             if let Some(id) = failed_req.req.license.id() {
                 notes.push(format!("{} - {}:", id.name, id.full_name));
 
+                let len = notes.len();
+
                 if id.is_deprecated() {
                     notes.push("  - **DEPRECATED**".into());
                 }
@@ -256,7 +258,13 @@ fn evaluate_expression(
                 if id.is_copyleft() {
                     notes.push("  - Copyleft".into());
                 }
+
+                if len == notes.len() {
+                    notes.push("  - No additional metadata available for license".into());
+                }
             } else {
+                // This would only happen if askalono used a newer license list than spdx, but we update
+                // both simultaneously
                 notes.push(format!("{} is not an SPDX license", failed_req.req));
             }
         }
diff --git a/src/licenses/gather.rs b/src/licenses/gather.rs
index eb6b7ea16..f93dbc8fe 100644
--- a/src/licenses/gather.rs
+++ b/src/licenses/gather.rs
@@ -130,6 +130,7 @@ struct LicensePack {
 struct GatheredExpr {
     synthesized_toml: String,
     failures: Vec<Label>,
+    notes: Vec<String>,
     expr: spdx::Expression,
     file_sources: Vec<String>,
 }
@@ -220,6 +221,7 @@ impl LicensePack {
         }
 
         let mut failures = Vec::new();
+        let mut notes = Vec::new();
         synth_toml.push_str("license-files = [\n");
 
         for lic_contents in &self.license_files {
@@ -237,7 +239,27 @@ impl LicensePack {
                     let text = askalono::TextData::new(&data.content);
                     match strat.scan(&text) {
                         Ok(lic_match) => {
-                            if let Some(identified) = lic_match.license {
+                            if let Some(mut identified) = lic_match.license {
+                                // See https://github.com/EmbarkStudios/cargo-deny/issues/625
+                                // but the Pixar license is just a _slightly_ modified Apache-2.0 license, and since
+                                // the apache 2.0 license is so common, and the modification of removing the appendix,
+                                // which causes askalono to think it is pixar instead is probably common enough we need
+                                // to just explicitly handle it. Really this should be fixed in askalono but that library
+                                // is basically abandoned at this point and should be replaced https://github.com/EmbarkStudios/spdx/issues/67
+                                if identified.name == "Pixar" {
+                                    // Very loose, but just check if the title is actually for the pixar license or not
+                                    if !data
+                                        .content
+                                        .trim_start()
+                                        .starts_with("Modified Apache 2.0 License")
+                                    {
+                                        // emit a note about this, just in case
+                                        notes.push(format!("'{}' fuzzy matched to Pixar license, but it actually a normal Apache-2.0 license", lic_contents.path));
+
+                                        identified.name = "Apache-2.0";
+                                    }
+                                }
+
                                 // askalano doesn't report any matches below the confidence threshold
                                 // but we want to see what it thinks the license is if the confidence
                                 // is somewhat ok at least
@@ -312,6 +334,7 @@ impl LicensePack {
             Ok(GatheredExpr {
                 synthesized_toml: synth_toml,
                 failures,
+                notes,
                 expr: spdx::Expression::parse(&expr).unwrap(),
                 file_sources: sources,
             })
@@ -358,6 +381,8 @@ pub struct KrateLicense<'a> {
     pub krate: &'a Krate,
     pub lic_info: LicenseInfo,
 
+    pub(crate) notes: Vec<String>,
+
     // Reasons for why the license was determined (or not!) when
     // gathering the license information
     pub(crate) labels: SmallVec<[Label; 1]>,
@@ -579,6 +604,7 @@ impl Gatherer {
                                     },
                                 },
                                 labels,
+                                notes: Vec::new(),
                             };
                         }
                     }
@@ -616,6 +642,7 @@ impl Gatherer {
                                         },
                                     },
                                     labels,
+                                    notes: Vec::new(),
                                 };
                             }
                             Err(err) => {
@@ -653,6 +680,7 @@ impl Gatherer {
                                             },
                                         },
                                         labels,
+                                        notes: Vec::new(),
                                     };
                                 }
                             }
@@ -678,6 +706,7 @@ impl Gatherer {
                         Ok(GatheredExpr {
                             synthesized_toml,
                             failures,
+                            notes,
                             expr,
                             file_sources,
                         }) => {
@@ -721,6 +750,7 @@ impl Gatherer {
                                     },
                                 },
                                 labels,
+                                notes,
                             };
                         }
                         Err((new_toml, lic_file_lables)) => {
@@ -763,6 +793,7 @@ impl Gatherer {
                     krate,
                     lic_info: LicenseInfo::Unlicensed,
                     labels,
+                    notes: Vec::new(),
                 }
             })
             .collect();
diff --git a/tests/licenses.rs b/tests/licenses.rs
index 3dd50a780..2fd8f9536 100644
--- a/tests/licenses.rs
+++ b/tests/licenses.rs
@@ -273,3 +273,45 @@ include-dev = true
 
     insta::assert_json_snapshot!(diags);
 }
+
+/// Ensures that an Apache-2.0 licenses without the appendix are not misidentified
+/// as Pixar, because Pixar is an almost exact copy of Apache-2.0. Fuck I hate licenses so much.
+#[test]
+fn forces_apache_over_pixar() {
+    let mut cmd = krates::Cmd::new();
+    cmd.manifest_path("tests/test_data/so-annoying/Cargo.toml");
+
+    let krates: Krates = krates::Builder::new()
+        .build(cmd, krates::NoneFilter)
+        .unwrap();
+
+    let gatherer = licenses::Gatherer::default()
+        .with_store(store())
+        .with_confidence_threshold(0.8);
+
+    let cfg = tu::Config::new(
+        r#"
+    allow = ['Apache-2.0']
+    "#,
+    );
+
+    let diags = tu::gather_diagnostics_with_files::<Config, _, _>(
+        &krates,
+        func_name!(),
+        cfg,
+        codespan::Files::new(),
+        |ctx, _cs, tx, files| {
+            let summary = gatherer.gather(ctx.krates, files, Some(&ctx.cfg));
+            crate::licenses::check(
+                ctx,
+                summary,
+                diag::ErrorSink {
+                    overrides: None,
+                    channel: tx,
+                },
+            );
+        },
+    );
+
+    insta::assert_json_snapshot!(diags);
+}
diff --git a/tests/snapshots/licenses__forces_apache_over_pixar.snap b/tests/snapshots/licenses__forces_apache_over_pixar.snap
new file mode 100644
index 000000000..bd4731bba
--- /dev/null
+++ b/tests/snapshots/licenses__forces_apache_over_pixar.snap
@@ -0,0 +1,53 @@
+---
+source: tests/licenses.rs
+expression: diags
+---
+[
+  {
+    "fields": {
+      "code": "rejected",
+      "graphs": [
+        {
+          "Krate": {
+            "name": "so-annoying",
+            "version": "0.1.0"
+          }
+        }
+      ],
+      "labels": [
+        {
+          "column": 12,
+          "line": 4,
+          "message": "license expression was not specified",
+          "span": ""
+        },
+        {
+          "column": 15,
+          "line": 5,
+          "message": "license expression retrieved via LICENSE-APACHE, LICENSE-PIXAR",
+          "span": "Apache-2.0 AND Pixar"
+        },
+        {
+          "column": 15,
+          "line": 5,
+          "message": "accepted: license is explicitly allowed",
+          "span": "Apache-2.0"
+        },
+        {
+          "column": 30,
+          "line": 5,
+          "message": "rejected: not explicitly allowed",
+          "span": "Pixar"
+        }
+      ],
+      "message": "failed to satisfy license requirements",
+      "notes": [
+        "'LICENSE-APACHE' fuzzy matched to Pixar license, but it actually a normal Apache-2.0 license",
+        "Pixar - Pixar License:",
+        "  - No additional metadata available for license"
+      ],
+      "severity": "error"
+    },
+    "type": "diagnostic"
+  }
+]
diff --git a/tests/test_data/so-annoying/Cargo.lock b/tests/test_data/so-annoying/Cargo.lock
new file mode 100644
index 000000000..2cad32326
--- /dev/null
+++ b/tests/test_data/so-annoying/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "so-annoying"
+version = "0.1.0"
diff --git a/tests/test_data/so-annoying/Cargo.toml b/tests/test_data/so-annoying/Cargo.toml
new file mode 100644
index 000000000..5194f9cd0
--- /dev/null
+++ b/tests/test_data/so-annoying/Cargo.toml
@@ -0,0 +1,5 @@
+[package]
+name = "so-annoying"
+version = "0.1.0"
+edition = "2021"
+publish = false
diff --git a/tests/test_data/so-annoying/LICENSE-APACHE b/tests/test_data/so-annoying/LICENSE-APACHE
new file mode 100644
index 000000000..f433b1a53
--- /dev/null
+++ b/tests/test_data/so-annoying/LICENSE-APACHE
@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/tests/test_data/so-annoying/LICENSE-PIXAR b/tests/test_data/so-annoying/LICENSE-PIXAR
new file mode 100644
index 000000000..715819ff7
--- /dev/null
+++ b/tests/test_data/so-annoying/LICENSE-PIXAR
@@ -0,0 +1,173 @@
+
+                               Modified Apache 2.0 License
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor
+      and its affiliates, except as required to comply with Section 4(c) of
+      the License and to reproduce the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
diff --git a/tests/test_data/so-annoying/src/lib.rs b/tests/test_data/so-annoying/src/lib.rs
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/tests/test_data/so-annoying/src/lib.rs
@@ -0,0 +1 @@
+