try implementing suggestions

8 files changed, 5 insertions, 3 deletions

diff --git a/library/backtrace b/library/backtrace
-Subproject 5e05efa87905fb5b351a2bc5644d60c57d6d932
+Subproject 72265bea210891ae47bbe6d4f17b493ef060661
diff --git a/src/doc/book b/src/doc/book
-Subproject 5e9051f71638aa941cd5dda465e25c61cde9594
+Subproject 45c1a6d69edfd1fc91fb7504cb73958dbd09441
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
-Subproject bbaabbe088e21a81a0d9ae6757705020d5d7b41
+Subproject cb58c430b4e8054c2cb81d2d4434092c482a93d
diff --git a/src/doc/reference b/src/doc/reference
-Subproject 6019b76f5b28938565b251bbba0bf5cc5c43d86
+Subproject 0b805c65804019b0ac8f2fe3117afad82a6069b
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
-Subproject 4840dca06cadf48b305d3ce0aeafde7f80933f8
+Subproject b1d97bd6113aba732b2091ce093c76f2d05bb8a
diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide
-Subproject 6a7374bd87cbac0f8be4fd4877d8186d9c31398
+Subproject aec82168dd3121289a194b381f56076fc789a4d
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 431db31d0dbeda320caf8ef8535ea48eb309340
+Subproject a1f47ec3f7cd076986f1bfcd7061f2e8cb1a726
diff --git a/src/tools/run-make-support/src/nm/mod.rs b/src/tools/run-make-support/src/nm/mod.rs
index c304877eba1..1f41792921d 100644
--- a/src/tools/run-make-support/src/nm/mod.rs
+++ b/src/tools/run-make-support/src/nm/mod.rs
@@ -3,8 +3,8 @@ use object::{Object, ObjectSection};
 use std::path::Path;
 
 #[derive(Debug)]
-pub struct Nm {
-    file: Option<object::File>,
+pub struct Nm<'a> {
+    file: Option<object::File<'a>>,
 }
 
 pub fn nm() -> Nm {
@@ -32,7 +32,9 @@ impl Nm {
         let object_file = self.file;
         let mut symbols_str = String::new();
         for section in object_file.sections() {
-            if let Ok(ObjectSection::SymbolTable(st)) = section.parse::<object::SymbolTable>() {
+            if let Ok(object::read::elf::SymbolTable(st)) =
+                section.parse::<object::read::elf::SymbolTable<'_, '_>>()
+            {
                 for symbol in st.symbols() {
                     symbols_str.push_str(&format!(
                         "{:016x} {:?} {}\n",